Fixed a bug in items.js & shopPage.js
Merge branch 'feature-shopPage' into develop