created user.js, user_spec.js
Merge branch 'dev'