modified:   view/common.css
	modified:   view/js/editor/editor.js
Merge branch 'master' of github.com:xiuno/xiunobbs