Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long.
Updating with jhass's code change. Still looking into Travis failure...
Fix for issue 5040: Adds completed_at column to account_deletions and sets timestamp upon successful completion. Depends on uniqueness of diaspora_handle when combined with person_id
Adding scope for account_deletion to get only those that are uncompleted and then adding that scope to accounts.rake. Tested it out and it works well
Fix for issue 5044: Adding tabindex attributes for add contact dropdown and contents, also binding keypress event to perform same action that click does.
Integrated Perfect Scrollbar into notifications dropdown
Adding tabindex='0' attributes to non-blueprint view elements since blueprint is so last week
Merge pull request #5150 from diaspora/update_gems

Update gems
Merge pull request #5151 from khall/issue_5090

Fix for issue 5090
Merge pull request #5156 from khall/issue_5040

Fix for issue 5040
Merge pull request #5158 from khall/issue_5044

Fix for issue 5044
changes hovercard background color to grey on hover
Merge branch 'release/0.4.1.0' into develop
Merge pull request #5129 from jaideng123/5106-scrolling_in_notifications

Increased the number of notifications shown in drop down bar to 15

Conflicts:
	Gemfile.lock
Fix loading issues in rails_admin

Properly declare Admin module and explicitly list models to be
display in rails_admin
Increase oembed cuke stability

By using the more robust step for posting
Fixed bootstrap pages
Merge pull request #5165 from jaideng123/5106-scrolling_in_notifications

Fixed notifications dropdown on bootstrap pages
Changelog note for change in jQuery CDN default
Merge pull request #5164 from goobertron/tos_notes

Changelog note for change in jQuery CDN default