Merge git://github.com/flavour/eden into EVASS

Conflicts:
	modules/s3db/event.py
	private/templates/EVASS/config.py
	private/templates/EVASS/controllers.py
	private/templates/EVASS/css.cfg
	private/templates/EVASS/gis_hierarchy.csv
	private/templates/EVASS/menus.py
	private/templates/EVASS/tasks.cfg
	private/templates/EVASS/views/_create.html
	private/templates/EVASS/views/_delete.html
	private/templates/EVASS/views/_display.html
	private/templates/EVASS/views/_list.html
	private/templates/EVASS/views/_list_create.html
	private/templates/EVASS/views/_update.html
	static/themes/EVASS/eden.min.css
	static/themes/EVASS/img/main001.jpg
	static/themes/EVASS/img/main002.jpg
	static/themes/EVASS/img/main003.jpg
	static/themes/EVASS/img/main004.jpg
	static/themes/EVASS/style.css