bundle update
bundle update
Merge branch 'master' of github.com:zunda/tdiary-core
Merge branch 'master' into zunda-local