Merge branch 'hotfix/fix-cms-lang-code'
fix url for members in template (bouh..) since fixing it properly would require a fork activity stream
Merge branch 'hotfix/fix-users-in-change-page' into develop