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

Conflicts:
	_test/plugins/font.js
[case]
Merge branch 'dev-1.2.6' of http://github.com/campaign/ueditor into dev-1.2.6
[case]
Merge branch 'dev-1.2.6' of http://github.com/campaign/ueditor into dev-1.2.6