Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop
refs #77 'bundle update'
refs #77 'bundle update' for rails-4.0.0 -> rails-4.0.2