New Inventory Format
Changes changes everywhere. Wait what.
Merge branch 'master' of https://github.com/ezfe/uhc

Conflicts:
	uhc-data.json