Changed saveGame, changed createHero, changed XML files, Removed WaterTheme, Created CityTheme
Merged master