check
check
Merge branch 'master' of /QTool/source/qtool

Conflicts:
	src/model/_actions.js
	src/model/_model.js
check
check
check