Small Json spacing fix
Remove unused old json data.
Add new get_long() json function
Allow for random charges at item generation
Add missing json long function
Convert internal charge tracking from int to long
Add cash cards

Also adds the NO_RELOAD flag for items
Move cash to long
Astyle ::bash
Add ATM examine function

Also some other small adjustments
Bank redesign
Small office mapgen fix
Message change
Make vending machines containers
Vending machines!
Vending machine menu updates
Item description price addition
Vending tweaks
Merge to mainline

Conflicts:
	src/advanced_inv.cpp
	src/crafting.cpp
	src/item_factory.cpp
	src/itypedef.cpp
	src/wish.cpp
Merge fix