Merge branch 'master', remote branch 'origin'
fix
Merge branch 'master' of github.com:limijiaoyin/slides-editor
Merge branch 'master' into kaguya
insert position fix
fix
Merge branch 'master' of github.com:limijiaoyin/slides-editor
Merge branch 'master' into kaguya

Conflicts:
	public/js/editor.js
scrollbar
Merge remote branch 'origin/master'
Merge branch 'master' into kaguya

Conflicts:
	public/js/editor.js
Merge pull request #7 from limijiaoyin/kaguya

scrollbar
modify views.js
Merge branch 'master' of github.com:limijiaoyin/slides-editor
add qrcode & modift views.js