Merge pull request #1 from wongp/master

what is this
Merge pull request #2 from wongp/master

pull request ---> merge
Merge branch 'develop' into staging
trying to resolve heroku issue