Added setting to customize name of project attachments tab, cutomized Sandy projects form
Added Project <-> Activity Type link table, added activity type to project, further customized SandyRelief projects.
More fixes for test suite.
Add a wait for page to load function
Merge branch 'master' of git://github.com/graeme-f/eden
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/tests/web2unittest.py
Fix, clearer meaning
Fix
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/michaelhowden/eden
Cleanup
DRRPP: Frameworks rebranded as Policies & Strategies. Move custom components into Template.
Fix
get_struct includes component alias (required with filtered components),
S3OCR using correct alias to find component (#1313).
Merge branch 'master' of git://github.com/flavour/eden
Search/Report submit buttons have classes for stylability, Fix customize_tablename, make deployment_settings more consistent in naming, DRRPP: Restore dataTables.multi (formerly new)
Merge branch 'master' of git://github.com/nursix/eden
More views are themeable, DRRPP: Switch Frameworks to List view as only a Search Simple
S3Map brought into line with S3Search. Fixes for S3Report show/hidden report options
Delphi tweaks