Items demo

Merging items demo changes into ControllerStructure to pick up the last minute changes to entities and get things ready to eventually merge together into master