CommandBridge Sync: use resource and domain identifiers (deployment setting), support for event_incident and cms_post synchronization, fix handling of ambiguous link/component aliases in S3Resource.get
Fix name collision between s3/codecs and Python built-in codecs
Import XSLT for vulnerability data with hierarchical indicators (also suitable for non-hierarchical taxonomy)
English or english?
De-customization
Hierarchy widget: tree relative to page instead of container (analogous to multiselect)
CRMT: Hierarchical filter+crud widgets for org_facility_type
Minify, consistent language for customise not customize
MCOP: Bugfix
Assets: Can optionally be linked to Groups. Actioned in IFRC template.
Merge git://github.com/flavour/eden into EVASS

Conflicts:
	modules/s3db/event.py
Assets: Add Condition as a Filter/Report Axis, fix prepop of
Location/Condition
HRM: Staff/Vols combined Summary view shouldn't have the Report tab
filtered uncontrollably
MCOP: Show Incident marker on Incident profile map
OCHAROCCA: Enable Hierarchical Indicators
AddpersonWidget2: Improve styling 9especially in IFRC template)
S3LocationFilter: Catch 1 case for ensuring that selected values are
visible in options.
Small cleanup of unused attributes of S3Resource
PNG config/hierarchy
Merge git://github.com/flavour/eden into EVASS