Merge branch 'development'
枠線消し忘れた
Merge branch 'master' into development
bump rails to 3.2.10