commit
commit1
Merge branch 'master' of https://github.com/chalermpondasri/Docking

Conflicts:
	.architect
	app/view/MyViewport.js