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
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
Merge branch 'master' of github.com:flavour/eden
S3TimePlot to support cumulative events, budget_allocation model (stub)
Bug fixes, clearer method names for adding previous/current events to a period, start SE for budget-trackable resource-assignments.
Facebook: Need BigInt on Postgres
CMS: Option to link Posts to Incident Types
ARC: Demo progress
Link tables can be SE instances.
Merge branch 'master' of git://github.com/nursix/eden
Make event_site a budget_cost_item
Merge branch 'master' of github.com:flavour/eden
Budget: Add Extra Instances
Event_X prepops for link tables
Fuxbixes
Bugfix geojson export.xsl
Msg: simple controllers to test Tweeting & Facebook Posting
ARC: Add Survey & other inject data
Merge branch 'master' of github.com:flavour/eden

Conflicts:
	modules/s3db/event.py