Merge request.

Most previous commits already applied previously.
Here we should set ALLOWED_HOSTS = ['orange.biolab.si', 'new.orange.biolab.si']