Merge branch 'master' of git://github.com/flavour/eden
Backport fix for S3MultiSelectWidget with multiple=False, fix S3Represent to handle foreign keys which get passed as strings
Merge branch 'master' of git://github.com/flavour/eden
MCOP: Revert Embedded create in Summary until LocationSelector & Summary
Map can co-exist
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/flavour/eden
Hierarchy toolkit to support node filtering, +unit tests.
Oops - sorry :$
Merge branch 'master' of git://github.com/nursix/eden
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
Hierarchical event types, +improvements/fixes for hierarchy widget
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)
Merge branch 'master' of git://github.com/nursix/eden
event_resource resource, minify
Event: event_resource resource, Link Posts to Incidents
S3Profile: more options for Bootstrap classes, cleanup unused vars
Project: Better config of Tasks
Bugfix defaults
Fixes to project_task filter_widgets
Fix/extend none option in S3OptionsFilter
Education Level is a dropdown (freetext available for
backwards-compatibility)
Religion can be a freetext
Name Format is configurable
VNRC Tweaks
Merge branch 'master' of git://github.com/flavour/eden