修改错误的注释
Merge branch 'master' into develop

Conflicts:
	Controller.class.php