Local update
Merge branch 'master' into zunda-local
Revert "Local update"

This reverts commit 8197c9ec6887a7f6012a496db49ea8be022ba94e.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
Follow upstream
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:zunda/tdiary-core
Merge branch 'master' of github.com:zunda/tdiary-core
Merge branch 'master' of github.com:zunda/tdiary-core