Merge remote-tracking branch 'origin/Karins_branch' into Karins_branch

# Conflicts:
#	target/classes/com/application/DB/AccountHandler.class
#	target/classes/com/application/DB/HelpingFunctions.class
#	target/classes/com/application/GUI/LineChartFunctionality.class
#	target/classes/com/application/GUI/PopUpWindows/InputPopup.class
#	target/classes/com/application/GUI/PopUpWindows/LoginPopup.class