Batch update - cities, shop, money, inn
Merge branch 'chris-branch' of github.com:jladdjr/lord-of-the-rings into chris-branch

Conflicts:
	cities/inn.py
	factories/shop_factory.py
	game_loader.py