Updated Catalan translation to 2d3df3e.
Update Catalan translation to 597ab20.
Merge branch 'hotfix/0.0.2.4'
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
Update Code Climate badge [ci skip]
...and make sure that it is a new list item... [ci skip]
Overflow name author mobile post
Overflow info_author mobile web
friendlier new-conversation mobile
fix regression from #3968

Not ordering the IDs caused incorret ones returned

The spec is totally at the wrong level but I couldn't make
something up that exposed the bug at a deeper level :(
Revert "fix regression from #3968"
Revert "Merge pull request #3968 from marpo60/limit_shareable_from_person_queries"

This reverts commit ddfc558a9b5d6ed19e89b7a6ad9ecf0dc4ebb8f9.
This reverts commit 30ed4b4e70f4768b310e94670f644e593a47e34f, reversing
changes made to f50ce2cb1d392a2f6fdb9bf99621634800306426.

limiting the fetch of the IDs breaks paginating, there's no quick way to fix that

I left the spec in for future use.
bump rack-ssl
bump fog
bump selenium-webdriver
bump carrierwave
bump factory_girl_rails
bump rails_admin and haml