by zhanyi01
by zhanyi01
Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

Conflicts:
	src/ui/dropmenu.js
Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev