Merge branch 'develop'
Merge branch 'master' into develop
travis2heroku
Merge branch 'heroku-config' into develop