Comment Update

Codes except controllers
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/webroot/js/ktree.js