enhancement
Merge branch 'master' of https://github.com/anoopchaurasia/drawing

Conflicts:
	web/index.html
	web/js/src/classes/drawing/tool/shape/ShapeManager.js