Fix for Python 2.6
Merge branch 'master' of git://github.com/flavour/eden
Merge pull request #495 from catalpainternational/master

DRMP: Map styling & profile page improvements
DRMP: Styling tweaks
DRMP: Tweaks (especially style)
Exclude bulky WKT when loading gis_layer_shapefile_* too
Customisable Label for Shapefile layers
Merge branch 'master' of git://github.com/flavour/eden
Fix c/p error in project model.
DRMP: Use LocationSelector2 for Offices (added support for Street Address
& no Map)
Merge branch 'master' of git://github.com/nursix/eden