fix border size type
Merge branch 'master' of github.com:limijiaoyin/slides-editor

Conflicts:
	public/js/editor.js