Merge branch 'develop' of github.com:martindale/shipright into tmp/mergeDev

Conflicts:
	app/controllers/projects.js