Full Merge Of Game & Battle

Need to add the logic for the Battle Nav and sort out character selection for graphics in the Battle Nav too