Fix for Heroku issues on start
Merge branch 'staging' of https://github.com/Alexander-Minyushkin/bitstarter into staging