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

Conflicts:
	Share/scenes/scene2.unity