deploy->develop (・ω<)
Merge branch 'heroku-config' into develop