Made methods for reading selected budget or budget archive more general with a...
Made methods for reading selected budget or budget archive more general with a parameter for file name + fixed all usages of these methods. Merged new changes with changes done by HS from main Also edited the expense categories, resolved test and resolve file handling related to the categories