Refactor userfields.
Merge branch 'master' of https://github.com/castorjs/castor-core