Fix toggling services for mobile bookmarklet
Merge pull request #4985 from jaywink/fix-mobile-bmarklet-services

Fix toggling services for mobile bookmarklet
Actually allow false as a value for sidekiq.backtrace in our Sidekiq
middleware
Load right stream with Show More on mobile

  - Load aspects stream if user is on this stream instead of loading the
    activity stream
Hide SPV controls unless authenticated

* cleaned and removed dead code

refs diaspora/diaspora#4711
Hide report icon on SPV if author is current user
Code style + allow aspects to be nil

  - Only use old hash style
  - Don't replace the aspect ids list with an empty array if it's nil
Test returned path for Show More on mobile

  - Added test when the currant page is Aspects Stream
  - Modified test for the Stream page to account for the new possibility
    (i.e current page is Aspects Stream)
lock nokogiri to 1.6.1, closes #4996
Merge pull request #5002 from taratatach/4999-show-more-in-mobile-aspects-stream-redirects-to-my-activity

Load right stream with Show More on mobile
Fixed overridden interactions by re-initializing
Merge pull request #5001 from Zauberstuhl/fixed_unauthorized_report_prompt

Hide SPV controls unless authenticated
Revert "Fix toggling services for mobile bookmarklet"
This fixed the toggling of services, but broke the actual
bookmarklet :)

This reverts commit 1bd7989045df5a2629543cb626ab3974e4cd9f11.
Fix typo
Merge pull request #5010 from Chocobozzz/patch-1

Fix typo
Fix broken bookmarklet if params have encoded linefeeds.
Closes #4994
Update changelog to reference fixes rather than bug reports, fix couple of typos.
Merge pull request #5008 from jaywink/bookmarklet-notes-linefeeds

Fix broken bookmarklet if params have encoded linefeeds.
Merge pull request #5007 from jaywink/revert-mobile-bookmarklet-fix

Revert "Fix toggling services for mobile bookmarklet"
Merge pull request #5012 from goobertron/changelog

Update changelog

Conflicts:
	Changelog.md