Custom markers for CAP based on priority of alert
- changed marker to grey
-solved s3_unicode issue
Extending POI functionality
-Select resource from popup functionality
Possible solution for #1537: iframe-safe datatable default actions (no solution for custom URLs yet, though)
organisation.xsl - support indefinite depth of branch hierarchy
Situation Report model: 1st cut
Vehicle: Types are configurable in a table, import csv/xsl
CRUD: Option to allow IFrame dataTables to open resources in a new tab
ARC: Progress on template
Refine auto-close logic of hierarchicalopts, bug fix deploy
ARC: Template progress
hierarchicalopts: micro-delay to allow visual feedback before closing the menu, start with root node open if there is only one.
ARC template progress, Language consistency tweaks, Minify
Fix #1538: tasks not currently linked to events (but to incidents)
Project: Fix Tasks <> Incidents not Tasks <> Events
ARC: A little progress
Merge branch 'master' of github.com:flavour/eden

Conflicts:
	modules/s3db/project.py
Adding D3 for timeplot (interim commit, not ready yet)
Fix incident_type.xsl
ARC: Subscriptions page, vehicle import works, although not yet on main
map
Remove old D3, update DC too & move to go with D3
Minify
Add missing duplicate detection for event_task
Merge branch 'master' of github.com:flavour/eden
Merge branch 'master' of git://github.com/nursix/eden
Facebook: Channel instead of deployment_settings, allow posting to a Page
Organisation Location Context is configurable
ARC: progress
*cms_post list_layout changes - using org name in place of logo
*IFRC Theme Minor Style changes
*ARC cms_post datalist
*ARC Staff
*ARC inject data - WIP
Merge branch 'master' of github.com:flavour/eden
ARC: Fix newsfeed, modal widths, split posts into different inject files
IFRC: Fix modal widths