Don't add thumbnail image when the source image was too small.
Changing grouping for adding members
Merge branch 'issue-472' of git://github.com/simong/Hilary into issue-472
Merge branch 'master' into messagebox

* master:
  Changing grouping for adding members
  Don't add thumbnail image when the source image was too small.