test
Merge branch 'master' of https://github.com/pkkgu/UEditor-for-ECMS1

Conflicts:
	GBK/controller.php
test

Conflicts:
	GBK/controller.php