Trainer package cleanup

TrainerType removed, in anticipation of NPC battles and battle rewards
WildTrainer added
PokemonTrainer API cleaned up, removing unnecessary parts
MapService creates wild battles using a WildTrainer
Battle.remove badge thing scrapped in anticipation of battle rewards
Cleaned up battle.addTrainerToPlayerHistory