Add tiles - begining

For Daniel to continue.
Merge remote-tracking branch 'origin/master'

Conflicts:
	mapeditor/index.html