fix item models
fix merge conflict
Merge pull request #66 from Edchen001/paperclip

Paperclip
Merge branch 'master' into dashboard