Developing update
Merge remote-tracking branch 'origin/master'

Conflicts:
	cakephp/app/Console/Command/ManageOhmiBusShell.php
Develop updating method of next