Include auth User model
Merge branch 'develop' into topic_user_sign_up