Fixed some errors
Add user.js model
XMerge branch 'master' of https://github.com/brotakovici/store