embedding youtube videos over https
SPV small improvements
improve reshared posts
Merge pull request #4752 from svbergerem/fix-timeago-mobile

Fix timeago on mobile devices. Fix missing space
bump kaminari
Updating queries for the stream to be faster
updated 31 locale files [ci skip]
Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https
Merge pull request #4754 from svbergerem/small-improvements-spv

SPV small improvements
Merge pull request #4702 from goobertron/new_logos

Updated image branding (issue #4444)
Merge pull request #4747 from Raven24/fix_aspect_stream

fix regression caused by updating backbone.js in aspect stream
Changing text messages -> conversations
Standardise - code refs to 'messages' to 'conversations'
Merge branch 'goobertron-rename_messages' into develop
Fix bugs introduced by #4754
Merge pull request #4770 from svbergerem/fix-spv-4754

Fix bugs introduced by #4754
Started converting the help section into a backbone view. Things missing are: some urls which were calculated and inserted into the yml, all the pre-existing erb templates are still there, it's still at /faq/faq, nothing has been tested, some of the questions don't collapse and expand.

changed the locales to have the hard coded urls in them because they can no longer be calculated server side. this is pretty crap because i'm going to have to change it for all the languages now so i might change my mind about this later.

deleted some unused views.
highlighting menu items when clicked. collapsing questions and answers on the static content help sections.

removed unused help haml templates.

put locales back to how they were and wrote a small js parser to swap in links to help views which have generated links in them.

using locales text for help section headers.
made a help view spec and cleaned up the views a bit.
moved call to help backbone view init to separate file included only on faq view.

extending loaded js locales.

cleaned up unused routes. removed some comments. loading help locales only on help view.

removed afterRender from backbone views. extended load_javascript_locales method to take a section.