Fix #1538: tasks not currently linked to events (but to incidents)
Merge branch 'master' of github.com:flavour/eden

Conflicts:
	modules/s3db/project.py
Adding D3 for timeplot (interim commit, not ready yet)
Fix incident_type.xsl
ARC: Subscriptions page, vehicle import works, although not yet on main
map
Remove old D3, update DC too & move to go with D3
Minify