FIX: Non-Admins couldn't send private messages through the new user expansion
main logo size consistency fix
Adjust ul,ol margins
Site setting to support showing real names in posts. Also put back in type to search on site settings
Merge pull request #1601 from awesomerobot/master

main logo size consistency fix
FIX: categories created by users who are deleted cannot be deleted
Merge remote-tracking branch 'upstream/master' into scrubbed

* upstream/master:
  FIX: categories created by users who are deleted cannot be deleted
  Site setting to support showing real names in posts. Also put back in type to search on site settings
  Adjust ul,ol margins
  main logo size consistency fix
  FIX: Non-Admins couldn't send private messages through the new user expansion