modify
remove ckfinder lience
modify
modify
modify
solve
Merge branch 'master' of
https://github.com/wuxincheng/wuxincheng-web.git

Conflicts:
	src/main/webapp/WEB-INF/views/ckeditor/main.jsp
	src/main/webapp/ckeditor/config.js