added locations, changed item ids, remove unnecessary item properties
Merge pull request #1 from Progether/master

added locations, changed item ids, remove unnecessary item properties
Merge pull request #2 from pthayer3/development

Development