added changes
Merge remote-tracking branch 'origin/history'

Conflicts:
	src/main/resources/config.properties
	src/main/resources/language_en.properties
	src/main/resources/language_no.properties