Creating template
Merge branch 'master' of ssh://mashover-arcadian.rhcloud.com/~/git/mashover

Conflicts:
	package.json
	server.js
Fixed comma in package.json
Added pusher to package.json
Added location.href to AgoNewWindowConfig, MasherApp, and the three system startups.
Added hostport, but not really needed with href.