project_TaskRepresent
MCOP: Moving Task Status to Config (Agree?) adding status and priority to task cards
Fixes for "year" computed field (NB: also works with Field.Method)
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
New EVASS template
Merge pull request #759 from oidualc/EV

New EVASS template
Merge pull request #760 from nerdis/master

project_TaskRepresent
GIS: Bugfix non-numeric geojson attributes
S3Profile: datalists fallback to orderby config if no list_orderby config
Events: Incident.xsl fixed/extended
MCOP: More Prepop details, Filter and Sort lists appropriately
S3Summary: Fix T() of tab labels, add Vi translations
Improve styling of advanced-filter toggle, cleanup unnecessary styles in foundation + filter formstyle-inline for empty labels
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/s3db/project.py
Also update EVASS theme with foundation core changes.
Make sure default options are available in S3OptionsFilter (otherwise
they can't be de-selected except using "Clear Filters")
Minify
MCOP: Tweak LocationSelector settings
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