Bug fix fast_select: secondary queries need all joins from dfields; filter sector filter for project time report
Bug fix fast_select: don't include vfltr fields in extract; Fix missing import in s3utils.py
Merge branch 'master' of git://github.com/flavour/eden
Make MembershipVirtualFields lazy
DRMP tweaks (inc partial merge Michael), Update Flot to v0.8
sync_conflict table deprecated
pr default list_fields & represent for NONE
Make grouped opts widget fit for crud forms, migrate ProjectDRRModel
Fix dt orderby.
Merge branch 'master' of git://github.com/flavour/eden
Bug fixes.
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

Conflicts:
	modules/s3/s3xml.py
Remove redundant check.
Fix de-duplicate list "SELECT ALL" (selection mode was reversed during POST)