matge
Merge branch 'master' of github.com:lastyrain/editor

Conflicts:
	juno/js/color_change.js
Merge branch 'master' of github.com:lastyrain/editor
Merge branch 'master' of github.com:lastyrain/editor
Merge branch 'master' of github.com:lastyrain/editor
marge and ppt