Updated Catalan translation to 2d3df3e.
Update Catalan translation to 597ab20.
Merge branch 'hotfix/0.0.2.5'
Overflow name author mobile post
Overflow info_author mobile web
friendlier new-conversation mobile
[WIP] aspect membership dropdown Backbone.js rework

* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships

TODO
* more tests
Merge pull request #3955 from diaspora/update_gems

Update gems
bump recommend ruby to 1.9.3-p385
remove obsolete thin.yml
updated 112 locale files [ci skip]
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca into develop
fix missing quote in javascript.ca.yml
last minute updates to french locale
Merge pull request #3864 from Raven24/aspect_memberships

[WIP] aspect membership dropdown Backbone.js rework
update changelog [ci skip]
fix markdown syntax in the changelog [ci skip]
Merge pull request #3984 from movilla/frienliar_new_conversation

Friendlier new conversation mobile
Merge branch 'overflow_author_infor' of git://github.com/movilla/diaspora into develop

Conflicts:
	Changelog.md
Merge branch 'overflow_mobile_post' of git://github.com/movilla/diaspora into develop

Conflicts:
	Changelog.md