Try to fix secret_token in development and heroku.
Merge branch 'dev'