Merge branch 'master' into 285-manage-permissions-for-persons-users-and-groups-django-groups-in-frontend