Merge branch 'develop' into 'spotit_multi_org'

observations/locale/zh_Hans/LC_MESSAGES/django.po

observations/locale/zh_Hans/LC_MESSAGES/djangojs.mo

observations/locale/zh_Hans/LC_MESSAGES/djangojs.po

organisms/locale/bs/LC_MESSAGES/django.mo

organisms/locale/de/LC_MESSAGES/django.mo

organisms/locale/nb/LC_MESSAGES/custom.mo

organisms/locale/nb/LC_MESSAGES/django.mo

organisms/locale/zh_CN/LC_MESSAGES/django.mo

organisms/locale/zh_Hans/LC_MESSAGES/django.mo

organisms/locale/zh_Hans/LC_MESSAGES/django.po

roughage/locale/de/LC_MESSAGES/django.mo

roughage/locale/nb/LC_MESSAGES/django.mo

roughage/locale/nb/LC_MESSAGES/djangojs.mo

roughage/locale/zh_CN/LC_MESSAGES/django.mo

roughage/locale/zh_CN/LC_MESSAGES/djangojs.mo

roughage/locale/zh_Hans/LC_MESSAGES/django.mo

roughage/locale/zh_Hans/LC_MESSAGES/django.po

roughage/locale/zh_Hans/LC_MESSAGES/djangojs.mo

roughage/locale/zh_Hans/LC_MESSAGES/djangojs.po

vips_messages/locale/bg/LC_MESSAGES/django.mo