Migrate CAP to S3Filter.
Merge branch 'master' of git://github.com/flavour/eden
Add 'id' to project_activity list_fields. Add missing files to Yolanda
template