switch out User for get_user_model()
Merge branch 'dev' of http://github.com/studentrentit/main