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.
Task Management:
* Show Task Activity field on Project Task Component List - NOT WORKING
* Show Time Est & Actual on Activity list_fields
Fixed duplicate code for DateTime Calendar in S3search
CustomForms also need to update_link when they use a link table.
Merge pull request #397 from somayjain/master

Fixed duplicate code for DateTime Calendar in S3search
Fix compiling of CRUD views that support customisation
Fix
More fixes for test suite.
DRRPP
* Fix Homepage Stats
* Move DRRPP Template code out of model
* Revise Search fields
* Run ui.customize... (Custom Controller) before parsing request in order to be able to configure search_method
* Action buttons should be explicitly update or read (need to be able to configure a buttom to open as read even if the user has permission to update)
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