Updates regarding configuration
Updates regarding codeviewer
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/husacct/control/task/configuration/ConfigurationManager.java