On branch unstable
Changes to be committed:
modified:   lib/mixins/custom/user.js
modified:   package.json
Merge branch 'unstable'