added user models
Merge commit 'ad5cfc5c035b1f00dc5cdcc62d2b15aef14aacb7'