Version 3.1.10

Change-Id: Id02998b06ef05bce2368058b8b800c90c50d69db
Don't error displaying 500 page.

base_site.html references org_name which is not available from 500.html.

Also remove broken link to home page in breadcrumbs.

Change-Id: I0fc80e503253486267be9e50e13dca3d1fa3ed5d
Serve static pages.

Ensure we serve static pages, as we have pipeline enabled.

Change-Id: I23483b0b1133f79f26a3cd05fb64ec2e2110a5b1
Merge branch 'develop' into feature-all-tests-pass
Fix broken LDAP tests, see .travis.yml for details on how to disable AppArmor so slapd can run with custom config.
Fix Travis config.
Add AppArmor to Travis config.
Remove AppArmor from Travis config.
Merge branch 'develop' into feature-all-tests-pass
All tests pass on my box, let's see what happens on travis-ci...
Updates to openldap configuration.

Change-Id: Ieb020e47c3b441fec4bac1463a11afe033ca6297
All tests passing... please?
Add missing requirements to .travis.yml
Depend on django-audit-log>=0.5.2 (from GitHub fork) for sanity.
Knocked off some TODO items, more tests passing!
Merge upstream/master into develop.
Merge branch 'develop' into feature-all-tests-pass
Merge branch 'feature-all-tests-pass' into develop
Merge branch 'develop' into feature-allocation-views