Integrate S3PivotTable in data views framework alongside S3DataTable and
S3DataList, abolish separate S3ContingencyTable (cleanup to follow)
Fix for long-type record IDs in current web2py.
Fix unit test for latest DAL interpretation of .contains()
Fixes+optimization.
IFRC fixes
Merge branch 'master' of git://github.com/nursix/eden
Partial merge of Michael's DRRPP work, add deduplicators for
project_hazard & project_theme link tables (not called for nested
resources yet)
Cleanups.
Merge branch 'master' of git://github.com/flavour/eden
Bug fixes.
done enhancement as given in TICKET #1191

some minor changes
DRRPP: partial merge from Michael, fix CSS issue. CSN: more prepop
Split query in pivot tables (mitigates the performance impact of multi-joins), still to be cleaned-up.
[Ticket #1404] 'Invalid Value' for Facility when creating an Asset
[Ticket #1404] 'Invalid Value' for Facility when creating an Asset and corrected tests
Excluding variable names from being shown on translation xls

Variable name fix (ToDo added)
Deprecate the datetime_format deployment_setting since we need to build
this from the components. IRS rheader fix. Fix IFRC min CSS
Fix import template download links in vol. Revert IFRC nav.js
Fix 500 bug identified by smoke tests
Fix #1406: duplicate left joins with multiple orderby-fields.