Player is now a Sprite
Merge branch 'master' of github.com:sallax/tilemaptest

Conflicts:
	core/src/com/mygdx/tile/Tile.java