Merge origin/master

Conflicts:
	static/admin/js/editor.js
Merge origin/master

Conflicts:
	source/controller/admin/articleController.class.php
	static/admin/js/editor.js
	static/common/js/plugin/jquery.selection.js
	template/admin/article/edit.tpl
Merge origin/master

Conflicts:
	template/admin/article/edit.tpl
Merge origin/master

Conflicts:
	source/event/editorEvent.class.php
Merge origin/master

Conflicts:
	source/controller/admin/articleController.class.php
	source/event/editorEvent.class.php
	template/admin/article/edit.tpl