Merge remote-tracking branch 'origin/gui' into gui

Conflicts:
	HighlanderChef/project.properties
change text of string in mar 3