ServersideActionsIndex
Merge branch 'master' of https://github.com/justphil/inform-cg

Conflicts:
	app/scripts/controllers/StaticCtrl.js
Merge branch 'master' of https://github.com/justphil/inform-cg