Merged branch: inline_editing
Merge branch 'master' of github.com:Tuxion/mokuji

Conflicts:
	CHANGES.md
	README.md
	mokuji/components/account/controllers/base/Controller.php