add ngui and start server client integration
Merge branch 'master' of https://github.com/proudaut/GGJ

Conflicts:
	GGJ.userprefs