Split out of shared model and publish files
Merge branch 'master'

Conflicts:
	server/gaMainApp.js