changes for UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	GoErgo.v12.suo