Heroku ready

Conflicts:
	Gemfile
	Gemfile.lock
fix
Activeadmin deploy fix
Activeadmin deploy fix
Gitignore fix
Merge branch 'master' into GS-heroku-deploy

Conflicts:
	Gemfile
	Gemfile.lock