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 '*'
revert server API check to allow testing of pre-adjustment PRs
merge develop -D org -I include -E exclude: PR 1324 (Jython scripts (See #918))
merge develop -D org -I include -E exclude: PR 1359 (testGetTile() checks against getPlane(). See #11315)
merge develop -D org -I include -E exclude: PR 1385 (Update the OMERO VirtualBox image)
merge develop -D org -I include -E exclude: PR 1418 (Use Python 2.6 features unconditionally)
merge develop -D org -I include -E exclude: PR 1421 (Import as bug develop)
merge develop -D org -I include -E exclude: PR 1633 (Upgrade ICE jars to version 3.5.1)
merge develop -D org -I include -E exclude: PR 1638 (OmeroCpp: Add cmake build system to replace scons)
merge develop -D org -I include -E exclude: PR 1641 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1645 (Prevent changing originalfile.mimetype from 'Directory')
merge develop -D org -I include -E exclude: PR 1646 (OmeroWeb Django upgrade from 1.3.1 to 1.5.4)
merge develop -D org -I include -E exclude: PR 1647 (Fixing the drag behaviour on tiled images for IE (see #11555))