statics/js/lib/ckeditor 編輯器
Merge branch 'master' of github.com:vegeden/dealer

Conflicts:
	.gitignore