Reverse language changes
Merge branch 'develop' of github.com:L3MNcakes/diaspora into develop
#4163 - Now updating correct contact attribute on retraction
Merge branch '4163-user-sharing' of github.com:L3MNcakes/diaspora into 4163-user-sharing