heroku adjustments
Merge branch 'develop'