Revert broken change to MultiSelect Widget, DRMP layout tweak
XML exporter to provide the original filename.
S3MultiSelectWidget can deal with dummy fields.
Merge branch 'master' of git://github.com/flavour/eden + fix MultiSelect
Must handle FieldS3 as well :/
XML exports of filename should show real filename not one on filesystem,
export_options should support IS_LOCATION
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/s3/s3xml.py
Remove redundant check.
Fix de-duplicate list "SELECT ALL" (selection mode was reversed during POST)
GIS Shapefile Layer support (incomplete)
Write-out in Binary
Merge branch 'master' of git://github.com/nursix/eden
gis_layer_shapefile progress
Make project_organisation_roles consistent across DRRPP, IFRC & trunk. Fix
bugs in orderby, s3translate, project, DRRPP
Merge branch 'master' of git://github.com/flavour/eden
DRMP tweaks, add 'Academic' organisation_type. Small optimisation of
inline_component.
Bugfix InlineComponent
Merge branch 'master' of git://github.com/flavour/eden
Various tweaks for DRRPP<>IFRC RMS interop