Changed CharacterLoader to use ResourceBundle; fixed merge conflicts in some map loaders
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam