Merge branch 'master' of git://github.com/flavour/eden
Fix broken unit test (after abandoning project_project.countries_id).
Merge branch 'master' of git://github.com/flavour/eden
Bug fixes.
Merge branch 'master' of git://github.com/flavour/eden
Fix broken project model.
Merge branch 'master' of git://github.com/nursix/eden
Survey fixes/cleanup