[case]
Merge branch 'dev-1.2.6' of http://github.com/campaign/ueditor into dev-1.2.6

Conflicts:
	_test/testDesign/test list for 1.2.6.1.xmind