Apparently I changed something...

GitHub claims I made a change, but I don't know what it is.  If the code
stops working, blame Github, not me.
Merge branch 'master' of https://github.com/Logiant/Castle-Battles

Conflicts:
	bin/.gitignore
	bin/game/Campaign.class
	bin/game/Game.class
	bin/game/buildings/CityManager.class
	bin/game/buildings/Farm.class
	bin/game/buildings/Mill.class
	bin/game/buildings/Mine.class
	bin/game/buildings/Quarry.class
	bin/game/buildings/Stable.class
	bin/game/entities/ResourceBuilding.class
	bin/game/ui/GameButton.class
	bin/game/ui/UI.class
	bin/game/world/Map.class
	bin/game/world/TileHandler$TileType.class
	bin/game/world/TileHandler.class
	bin/game/world/tiles/GroundTile.class
	bin/game/world/tiles/WallTile.class
	bin/game/world/tiles/WaterTile.class
	bin/widgets/Text.class