allowed search by email address in the user search bar
restricted version of Django from above
Merge remote-tracking branch 'upstream/master'