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

Conflicts:
	minder_module/module.default.test.js