Switched to polymorphic model, removed item_tag, added new models
Merge branch 'polymorphic_models' into develop