Modified for staging on heroku
Merge branch 'develop' into staging