by zhanyi
by zhanyi
Merge remote-tracking branch 'origin/bootstrap.ueditor' into bootstrap.ueditor

Conflicts:
	_examples/completeDemo.html
	_src/ui/modal.js