Started to fix grid bugs

Made gridOn and gridOff
Merge remote-tracking branch 'origin/master'

Conflicts:
	mapeditor/js/main.js