Nu funkar det att byta språk... typ
Merge branch 'master' of ssh://git@github.com/Nea5/GUI_project.git

Conflicts:
	TimeManager/src/gui/resources/language.properties