Highlight tile
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefense/Tile.cpp
Merge branch 'master' of https://github.com/eorielle/TowerDefense