[add]      by xuheng
Merge remote-tracking branch 'origin/bootstrap.ueditor' into bootstrap.ueditor

Conflicts:
	_examples/completeDemo.html
[add]      by xuheng