Merged draw back to master
Merge branch 'draw' of https://github.com/Maprunner/rg2 into draw

Conflicts:
	js/rg2.js