Travis RVM doesn't know it yet

Revert "bump recommended rubygems version"

This reverts commit e9526ee93faf1dccd7d05288becd19ed12ccd2ea.
First stab at extracting a color palette

- Pulled out the existing palette in _mixins
- Took a stab at naming greys after their usage count in contexts
- Replaced #a40802 with #a80000, since they are very close and $red was already in the palette

Missed importing 'colors' in a couple of places

Removing a redefined  in favor of  in colors.css.scss

Fixing missed imports #2

Renamed $background to $background-white

Explicitly calling out the color of the background, since we have many
background colors
Merge branch 'ssrihari-color-palette' into develop
Fix style in profile sidebar / contacts
Merge pull request #4451 from svbergerem/patch-1

Fix style in profile sidebar / contacts
Single click selects the invite link

- Earlier, triple-clicking or drag & select had to be performed to select
- Should consider a copy button

Moving away from the inline onClick handler

It didn't feel right to be writing js in a helper.

Refactoring setupInviteLinks into a sidebar Backbone View
Merge branch 'ssrihari-click-to-select-invite-link' into develop
Merge branch 'develop' of github.com:diaspora/diaspora into develop

Conflicts:
	Changelog.md
bump redis-namespace even though the security issue does not affect us

The issue only shows if you have a send :exec, user_input in your
codebase, neither we nor Sidekiq does that.

See https://github.com/resque/redis-namespace/issues/64 and
https://github.com/resque/redis-namespace/issues/65#issuecomment-22120560
Disable 'Mark all as read' for notifications when everything is read

- This action needn't be performed when all notifications are read,
  hence disabling it is a good practice
- Added a link-disabled-color
- Used css pointer-events to disable clicking on the link

Preventing default on click for the mark_all_read_link

- avoiding the use of pointer-events
- setting up disabled only for mark_all_read_link

Moved disabling of the link to a global handler

- Added disabled class to the button in /notifications when all are read
- Styled the disabled button
- Adding disabled class after completion of ajaxRequest
Merge branch 'ssrihari-disable-mark-all-read' into develop
error 500 when visit probile mobile and logged out. Fix #4458
Merge pull request #4464 from movilla/profile_mobile_500

Error 500 when visit probile mobile and logged out. Fix #4458
Collapsing aspects_list and followed_tags when they aren't active

- Each time a stream is rendered, other lists are emtied
- Using Backbone.history.fragment to detect active stream
- hideInactiveStreamLists is best pushed into a before/after filter

Added tests for hideInactiveStreamLists
Merge branch 'ssrihari-hide-inactive-streams' into develop
Fix size of images in the SPV
Fix preview with more than one mention
Merge pull request #4472 from svbergerem/fix-mentions-in-preview

Fix preview with more than one mention
Merge pull request #4471 from svbergerem/fix-size-of-images-in-spv

Fix size of images in the SPV
Add border-dark-grey

Substituting -grey for #999

Moving #888 text color to -grey

Adding border-dark-grey

Removing border-dark-grey from places where it isn't appropriate