OCHAROCCA
* Vulnerability -> Baseline
* Adding Facilities
* Display Indicator Description in Popover
* remove un-needed location data files (Can be found on http://eden.sahanafoundation.org/wiki/GIS/Data)

MCOP
* event_incident import csv & xsl
* Use event_incident instead of project_project
* Incident - add location & organisation field
Cleanup merge, fix link between Incidents & Tasks, restore the injected
Project/Activity/Milestone in Tasks (rewritten to use S3SQLForm and made
sensitive to deployment_settings...as are list_fields & filter_widgets)
Extend S3SQLInlineComponent to support tuples of fields: primarily to
allow nullifying the label in just this context (otherwise gets messy
having to nullify & reset in different places...the resetting thus makes
it harder to change a label for different contexts)