added minimal layout for bookmarklet popup
fix failing bookmarklet specs (wait for js to finish)
Merge pull request #3484 from Raven24/bookmarklet-layout

fix bookmarklet
if you have a : in a translatable string and no %{} you already know you're doing it wrong [ci skip]
Updated the Galician (gl) translation.
Merge pull request #3485 from Gallaecio/l10n-gl

Updated the Galician (gl) translation.
updated 12 locale files [ci skip]
Merge branch 'master' of https://github.com/sfawaz/diaspora into sed-fix
don't use extended regexp for sed (not needed)
Refactored cucumber features, steps, and support helpers for change password feature
stream 'reshare' link undeliberately got the same font-size as the container [ci skip]
Merge pull request #3486 from devendram/cukes-refactor

Refactored cucumber features, steps, and support helpers for change pass...
fix markdown linking of images, also improve tests grammatically
+ 1 js syntax error
implement "special symbols" (switch certain strings for utf-8 symbols), fixes #3140
Merge pull request #3487 from Raven24/text-formatting

markdown linked image fix, special text formatting
Merge pull request #3482 from Raven24/public-fetcher

first working version of a 'post fetcher' for remote accounts
Adding step definitions to facilitate merging of multiple consecutive "I (should|should not) see " clauses on single statement, adding one example as well
fix autolinking links that start with just www... and not a complete http://...
(fixes #3468)
Merge pull request #3489 from Raven24/autolink-fix

fix autolinking of links
make the "last post" link show ownly if the person has any posts
(fixes #3437)