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

Conflicts:
	src/module/keyboard.js