Basically finished Map generation

Probably more tweaks coming in the future
Merge branch 'master' of https://github.com/PhoenixTeamMC/PheonixRPG

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