Exclude the import log from the list of files.
Update Django to 1.5.4
Django 1.5.4 requires a default cache
Fix template_loader imports
Fix direct_to_template
Replace django.views.generic.simple.redirect_to
Fix urlpatterns by moving (?i) prefix
Quote all view names in url tags
Add new omero.web.allowed_hosts setting, defaults to '*'
Disable multithreaded development web server
Force Django 1.5 development web server to always run in nothreading mode
Upgrade to Django 1.6
Remove deprecated django.contrib.markup application
Update manage.py to Django 1.6; move nothreading monkeypatch
Fix deprecated urls import
Revert session serializer back to pickle (instead of default json)
Merge branch 'develop' into django-1.6

Conflicts:
	components/tools/OmeroWeb/omeroweb/urls.py
Clean up code.
Remove tabs and whitespace.
Add check if all required fields are entered.