viiii hoppas
Merge remote-tracking branch 'origin/master'

Conflicts:
	TimeManager/src/gui/TimeManager.java
	TimeManager/src/gui/TimeMenuBar.java
	TimeManager/src/gui/resources/language_en_GB.properties
	TimeManager/src/gui/resources/language_sv_SE.properties