fix regression caused by updating backbone.js in aspect stream

Updated image branding (issue #4444)

SPV small improvements

Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https

Fix timeago on mobile devices. Fix missing space

fix timeago

Do not retry sending out posts on SSL errors.  See #4728

Refactor HydraWrapper so the when-to-retry logic is in the worker

Stabilize cukes

Fix css for keyboard navigation

Also reuse comment step for comment deletion cuke.
This effectively masks failures of the comment deletion cuke
until we find a real solution.

in features/desktop/aspect_navigation.feature:18 we quickly leave the page
before waiting for the request to finish. By making the HTTP call
synchronous we wait for it to finish before we reflect the change in the DOM,
thus giving Capybara a chance to wait for it. Also let Capybara wait longer.
This should random failures of the aforementioned cuke rarer.

Updated the Galician (gl) translation and fixed a typo

Remove unused beta code

Remove unused cubbies code

[Ready to review & merge] Add permalinks for comments

Conflicts:
	app/assets/stylesheets/application.css.sass

Drop number of followers from tags page

Conflicts:
	Changelog.md
	config/defaults.yml

(cherry picked from commit 5c059b29)

Conflicts:
	Changelog.md

Moves rails-timeago into the root of Gemfile, it's used in views + assets

Added post reporter feature

Conflicts:
	Changelog.md
	app/assets/stylesheets/application.css.sass
	db/schema.rb