Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	public/mapeditor/src/mode/DrawPolygon.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/mapeditor/src/control/Toolbar.js