Merge branch 'master' of git://github.com/flavour/eden
No test called search_staff
Merge branch 'master' of https://github.com/VishrutMehta/eden
Bug fix.
Fix inv_rheader for track_items, Tweak SandyRelief menus, Tweak DRMP Map
DRRPP style tweak
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/eden/inv.py
Make dl an interactive format, empty profile widgets can be refreshed,
profile map layers refreshed, DRMP: contexts applied to Org/Location
profile pages
Profile iFilter/Context applied to Updates too
Support more aggressivei clustering
Merge branch 'master' of git://github.com/flavour/eden
Cleanup
Datalist Ajax-delete reports the UUID of the deleted record.
Refresh Map layers on AJAX delete in datalists, Update OpenLayers to
current Trunk + Merge SLD Externalgraphic support
Merge branch 'master' of git://github.com/nursix/eden
& make use of to remove just the deleted Feature from the Map
Merge branch 'master' of git://github.com/nursix/eden into HEAD
Delete just the feature iif we can (currently only if unclustered)
Merge branch 'master' of git://github.com/flavour/eden
Work on Survey/Canvassing for SandyRelief

SandyRelief survey templates and sample data
CSN: Display hash lines inside polygons for Fire perimeter/evac zones,
Make simplify_tolerance a deployment_setting