flexible deploy
Merge branch 'master' of github.com:jseto/js-mean-seed

Conflicts:
	app.json