fix for heroku
fix interface bugs
Merge branch 'master' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Gemfile