Merge remote-tracking branch 'origin/master'

Conflicts:
	Robotopia/Classes/Tile.cpp

Merge remote-tracking branch
'origin/master'

Conflicts:
	Robotopia/Classes/Tile.cpp

mapTool

mapTool