Merge branch 'develop'
Add User model class.