big restructuring
merged remote to local
Merge remote-tracking branch 'origin/master'

Conflicts:
	userinterface/source/initialize.cpp
	userinterface/source/initialize.h