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.