Merge branch 'eplevikler' into 'develop'

VIPSWeb/settings.py

VIPSWeb/static/css/fonts/glyphicons-halflings-regular.eot

VIPSWeb/static/css/fonts/glyphicons-halflings-regular.svg

VIPSWeb/static/css/fonts/glyphicons-halflings-regular.ttf

VIPSWeb/static/css/fonts/glyphicons-halflings-regular.woff

VIPSWeb/static/css/fonts/glyphicons-halflings-regular.woff2

VIPSWeb/urls.py

cydiapomonella/__init__.py

cydiapomonella/admin.py

cydiapomonella/apps.py

cydiapomonella/locale/nb/LC_MESSAGES/django.mo

cydiapomonella/locale/nb/LC_MESSAGES/django.po

cydiapomonella/migrations/__init__.py

cydiapomonella/models.py

cydiapomonella/static/css/datatables.min.1.10.21.css

cydiapomonella/static/js/datatables.min.1.10.21.js

cydiapomonella/static/js/handlebars4.7.6.js

cydiapomonella/static/js/moment-timezone-with-data.min.js

cydiapomonella/static/js/moment-timezone.js

cydiapomonella/static/js/moment.min.js