added model user
Merge branch 'feature-model-user' into develop