Colors and support for no_deploy
Fixes for production
Merge branch 'production-fixes' into for-prod

Conflicts:
	api/controllers/HooksController.js
	public/mast.js
Merge branch 'hooks-for-github' into for-prod