local changes
Merge branch 'social.mrzyx.de' of github.com:MrZYX/diaspora into social.mrzyx.de