Conflicts: AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java