Refactored ItemStore
Fixed JSON encoding of Items
Began refactoring
Mostly finished refactoring
More refactoring
Pulled remote
Merged in weberc2_dev