minor changes - most for gui
Merge branch 'master' of https://github.com/beyondtheline/2013_stimmmaler

Conflicts:
	Patches/_root.v4p
	Patches/_root~.xml