Merge branch 'hotfix/0.0.2.4'
Twitter/Facebook/Tumblr count down characters is hidden by the picture of the post
limit ShareablesFromPerson queries to improve performance
update changelog
Merge pull request #3963 from movilla/publisher_counter

Twitter/Facebook/Tumblr count down characters is hidden by the picture of the post. Close #3956
Merge pull request #3968 from marpo60/limit_shareable_from_person_queries

limit ShareablesFromPerson queries to improve performance
friendlier mobile buttons
Merge pull request #3973 from movilla/buttons_mobile

Buttons on mobile are hard to click on
added a id and a autoscroll to first unread message in conversation (Fix: #3216)
Merge pull request #3967 from prellele/autoscroll_to_unread_messages_in_conversation

added a id and a autoscroll to first unread message in conversation
* Fix CVE-2013-0269 by updating the gems json to 1.7.7 and multi\_json to 1.5.1. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58)
* Additionally ensure can't affect us by bumping Rails to 3.2.12. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8)
* And exclude CVE-2013-0262 and CVE-2013-0263 by updating rack to 1.4.5.
Merge branch 'hotfix/0.0.2.5' into develop

Conflicts:
	Changelog.md
	Gemfile.lock
	config/defaults.yml
Facebook delete test
Facebook delete test
Issue #3939: Updates to Facebook do not delete
Issue #3939: Updates to Facebook do not delete (clean ups)
Merge branch 'feature/facebook_delete' of github.com:L3MNcakes/diaspora into feature/facebook_delete
Issue #3939: Updates to Facebook do not delete (clean ups)