Merge remote-tracking branch 'origin/master' into frontend-merge-HSrecipe

# Conflicts:
#	src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
#	src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java
#	src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
#	src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java
#	src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java
#	src/main/java/no/ntnu/idatt1002/demo/data/Budget/GeneralBudget.java
#	src/main/resources/Budget/Budget.budget
#	src/main/resources/Economics/Expense.register
#	src/main/resources/Economics/Income.register
#	src/main/resources/view/BudgetNewest.fxml
#	src/main/resources/view/IncomeAndExpenses.fxml
#	src/main/resources/view/MainMenuNew.fxml
#	src/main/resources/view/dualList.fxml
#	src/main/resources/view/newBudgetBudgert.fxml
#	src/test/java/no/ntnu/idatt1002/demo/data/Budget/GeneralBudgetTest.java