try to fix heroku upload
Merge branch 'develop'