MCOP: Moving Task Status to Config (Agree?) adding status and priority to task cards
Cleanup: Revert 'Active' status = 2 ('New') otherwise prepop fails & this
is closer in meaning.
Merge branch 'master' of git://github.com/nursix/eden
Project Beneficiary & Stats: "year" as report axis & filter
Fix project_beneficiary year-filter
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/s3db/project.py