refactor for hehoku
upgrade rails
Merge branch 'develop'