Changing over from embedded to belongs_to
Adding Item tests
Merge branch 'develop'