Switch Wrike imports to event_incident (partial)
Use a Computed Field for stats_year (working only as list_field currently)
Bugfixes & Cleanups
Merge branch 'master' of git://github.com/nursix/eden
Allow app to be compiled
MCOP: Re-enable project_task.location_id
MCOP bugfix: Need the L0!
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