Generate scaffold for Items
Merge branch 'master' into develop
Update gems