Merge branch 'master' into elias/fix/facilities

backend/secfit/comments/admin.py

backend/secfit/comments/models.py

backend/secfit/comments/urls.py

backend/secfit/comments/views.py

...d/secfit/facilities/migrations/0004_auto_20210407_1951.py

backend/secfit/secfit/settings.py

backend/secfit/users/admin.py

backend/secfit/users/forms.py

backend/secfit/users/models.py

backend/secfit/users/serializers.py

backend/secfit/users/tests/UserRegistration.py

backend/secfit/users/tests/__init__.py

backend/secfit/users/tests/offers.py

backend/secfit/users/tests/test_data.py

backend/secfit/users/tests/user_registration.py

backend/secfit/users/tests/user_serializer.py

backend/secfit/users/urls.py

backend/secfit/users/views.py

backend/secfit/workouts/mixins.py

backend/secfit/workouts/models.py