cm for root
Merge remote-tracking branch 'origin/UserSessionConnect' into UserSessionConnect

Conflicts:
	public/uccello/baseControls/controlMgr.js