Zooming
Zooming
Merge branch 'master' of https://github.com/maydesk/modules.git

Conflicts:
	modContext/src/main/resources/js/MDCanvas.js