Pre-merge
Merge branch 'MapGenerator' of https://github.com/Divoolej/VRAS into MapGenerator

Conflicts:
	core/src/com/ant/very/objects/MapEntity.java