Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: (24 commits)
  Remove tilde files
  Tobias outlined a rare situation where a site admin may not have an admin account, and will therefore need to do things in .htconfig.php
  .
  more wrong name
  add renamed package
  dash in filename won't work with plugins
  smilies_adult install issue after rename, package updates
  deleted:    adult_smile/adult_smile.php 	modified:   smiley_pack/smiley_pack.php 	renamed:    adult_smile/icons/bong.gif -> smilies-adult/icons/bong.gif 	renamed:    adult_smile/icons/drunk.gif -> smilies-adult/icons/drunk.gif 	renamed:    adult_smile/icons/sperm.gif -> smilies-adult/icons/sperm.gif 	renamed:    adult_smile/icons/tits.gif -> smilies-adult/icons/tits.gif 	new file:   smilies-adult/smilies-adult.php
  Brought readme up to date
  Brought readme up to date
  Brought readme up to date
  Brought README up to date.
  Changed the README for my variant, and changed "Last" users/likes/posts to Latest users/likes/posts.
  Improved nsfw/content filter
  Reworded the UI of NSFW to make it more obviously a general purpose content filter
  Facebook: Design issues in the export
  Migration hint: the form cannot be used as long as the settings are set in .htconfig.php, so tell this to the administrator.
  Check if the given AppID/Secret works. Make the polling interval configurable.
  wppost: Mechanism for guessing the title added
  facebook: If the body is empty then the link is taken.
  ...

* master: