release 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	js/controllers/lineDrawController.js
	js/controllers/mainController.js
	js/drawers/baseDrawer.js
	js/drawers/lineDrawers.js
	js/utils.js
	js/workplace.js