last update before pull
Merge remote-tracking branch 'origin/Player-Rewrite' into Player-Rewrite

Conflicts:
	core/src/com/FOS/Pixel/Box2DTiledMapParserTest.java
resolved conflicts