Merge develop into UpdateRognebærmøll

VIPSWeb/local_settings_sample.py

VIPSWeb/locale/bg/LC_MESSAGES/django.po

VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po

VIPSWeb/locale/bs/LC_MESSAGES/django.po

VIPSWeb/locale/bs/LC_MESSAGES/djangojs.po

VIPSWeb/locale/de/LC_MESSAGES/django.po

VIPSWeb/locale/de/LC_MESSAGES/djangojs.po

VIPSWeb/locale/fi/LC_MESSAGES/django.po

VIPSWeb/locale/fi/LC_MESSAGES/djangojs.po

VIPSWeb/locale/nb/LC_MESSAGES/django.mo

VIPSWeb/locale/nb/LC_MESSAGES/django.po

VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po

VIPSWeb/locale/vi/LC_MESSAGES/django.po

VIPSWeb/locale/vi/LC_MESSAGES/djangojs.po

VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.mo

VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.po

VIPSWeb/locale/zh_Hans/LC_MESSAGES/djangojs.po

VIPSWeb/settings.py

VIPSWeb/static/css/vipsweb.css

VIPSWeb/static/js/util.js