Moved to libGDX map
Merge branch 'master' of https://github.com/PhoenixTeamMC/PheonixRPG

Conflicts:
	core/src/pheonixTeam/main/Map.java
	core/src/pheonixTeam/main/entity/EntityPlayer.java