Make event_site a budget_cost_item
Merge branch 'master' of github.com:flavour/eden
Merge branch 'master' of github.com:flavour/eden

Conflicts:
	modules/s3db/event.py
Merge branch 'master' of github.com:flavour/eden
Ajax-reload and filter form for timeplot, refinements (work in progress, do not "clean up" yet)
Catch a couple of MemoryErrors with large WKTs
Survey: Simplified URL to fill out Assessment
Org: deployment_setting to show resources on tab
ARC: More prepop
Minify