#983 Search users by email/name
open-classifieds/openclassifieds2#508 (Block uploads of nudity?)
Merge remote-tracking branch 'upstream/master'
change image.aws_s3_domain config to select.
Merge pull request #55 from oliverds/master

A couple of enhancements