by zhanyi
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/module/editor.js
by zhanyi
by zhanyi
by zhanyi
atore
Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev
by zhanyi
test
Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev
added icon
by zhanyi
select
Merge branch 'dev' of https://github.com/kitygraph/kityminder into gh-pages
dist