controller二次修改
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/webroot/js/ktree.js
Merge pull request #4 from gregreat/master

controller代码注释三次修改