Bug fixes: can't use result caching in a loop that changes the premises, SetRoleTests must not rely on prepop record IDs
Fix scope in SetRoleTests.
Merge branch 'master' of git://github.com/flavour/eden
DRMP/CRMT: Notifications framework with saved filters (first cut).
Cleanup.
DRMP subscriptions: hide resource selector (always cms_post via newsfeed oage), hide method selector (always EMAIL), series_id filter becomes checkbox-widget
Preferred email format for notifications, notifications subject line configuration, improved S3Resource.list_fields, deployment settings to configure notification fallbacks, notification message templates...
Bug fix.
Helper class to represent filter queries in a human-readable format, +bug fixes
Filter queries in notification messages, text/html notification format separation.
CRMT
* UI Enhancements
* Importing Activity Types (still broken)
* Locations -> Places
* Residents + Trained People -> People
* Remove Incidents
* Risks -> Hazards
* Improve AddPerson widget css
* Improve AddLocation css (geocode)
* Change Menus
* Add resource cms_content to homepage
DRMP
* Add Project Themes (already imported on server)
* Add Project Search
* Add Donors & Partners to project.xsl
* Homepage: DRY + News -> Alerts only
* Contact Page
* Option for approval emails to be sent to all admins
Vi updates from IFRC, COUNTRY simplified lookup
Merge branch 'master' of git://github.com/michaelhowden/eden
Cleanup,minify
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/tldrmp