Merge branch 'develop' into epic/yearly-maintainance

VIPSWeb/__init__.py

VIPSWeb/context_processors.py

VIPSWeb/local_settings_sample.py

VIPSWeb/locale/nb/LC_MESSAGES/django.mo

VIPSWeb/locale/nb/LC_MESSAGES/django.po

VIPSWeb/settings.py

VIPSWeb/static/js/frontpage.js

VIPSWeb/static/js/frontpageMap.js

VIPSWeb/static/js/js_apps/oatFloweringModelForm.js

VIPSWeb/static/js/util.js

VIPSWeb/static/js/validateForm.js

VIPSWeb/static/js/weatherStationSelectorMap.js

VIPSWeb/templatetags/__init__.py

VIPSWeb/templatetags/template_helper.py

VIPSWeb/test.py

VIPSWeb/urls.py

VIPSWeb/views.py

VIPSWeb/wsgi.py

applefruitmoth/__init__.py

applefruitmoth/admin.py