tile/player edits
Merge remote-tracking branch 'origin/master'

Conflicts:
	Boardgame/Player.h
	Boardgame/Tile.h