gets Al's work on shortcodes back into a commit on github.com

This reverts commit 93d00277a6ad96299df3d5c69270cc763ce8037c.
solves conflicts
creates a log of users who sign in to use the stream
uploads images used for Outliner
uploads catchup4 image
overlays image with play button
revises search for arbor page
uploads swarmTV catchup No 5
tests string to rename audio file
inserts a semi-colon
includes a comma after the size regular expression
takes out recentChanges from swarm search
takes out recent changes from swarm without making it crash!
uploads catchup6 image
uploads correct catchup image
repairs missing directory to replace ogv filename with the oga version
tests out whether non-found pages are due to a limit of linked pages
corrects the search mysql statement to include pages that are not linked into the swarm
testing small things to improve recentChanges
Merge branch 'master' into shortcodes