User model
Merge branch 'master' of https://github.com/vienlemai/library-dev