app.js start script
Merge branch 'master' of https://github.com/codeocelot/config_manager
Merge branch 'master' of https://github.com/codeocelot/config_manager

Conflicts:
	Client/MacroModelEditor/javascripts/config_managerbundle.js
	Client/MacroModelEditor/javascripts/loadbundle.js
	lib/package.json
grunt doesn't like lib
grunt on windows doesn't like lib