save
Merge branch 'racer' of github.com:limijiaoyin/slides-editor into racer

Conflicts:
	public/js/editor.js
add audio selector