deployment setup
Merge branch 'develop' into marionette

Conflicts:
	Gemfile
	Gemfile.lock
fixed Gemfile.lock