make User model configurable
Merge branch 'configurable_user_model'