Merge branch 'master' of github.com:exodev/social into feature/generic-user-popup