secret token is accessible on heroku
Merge branch 'master' of heroku.com:lpdc-v2 into stable

Conflicts:
	Gemfile
	config/initializers/secret_token.rb
Merge branch 'master' into stable

Conflicts:
	.gitignore
	config/initializers/secret_token.rb
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' of pjambet_heroku:lpdc-v2
Fix viewport for mobile devices
Add gem dependency for sentry