Merge branch 'hotfix/1.0.2'
Added line for Devise on Heroku
Merge branch 'hotfix/1.0.3' into develop