fix code style
new setting panel
Merge branch 'master' of https://github.com/zhulin3141/Ckeditor4Typecho

Conflicts:
	Plugin.php