Reverse options lookup in S3OptionsFilter (better scalability than
forward lookups of unique values for foreign keys).
SMS maxLength. Deploy Alerts can go via SMS &/or Email. Better logging of
SMS API responses
Merge branch 'master' of git://github.com/nursix/eden
Fix S3LocationFilter: resource can be None (e.g. subscriptions)
Early prototype of generic time plot report method (experimental)
Restore missing Markers, raise nicer error when trying to use Map without
prepop data, Syria 4W tweaks
Merge branch 'master' of git://github.com/nursix/eden
Fix PoIs with spatial DB, fix project.xsl import & PoIs style for IFRC
update_location_tree() extra catch
Syria 4W template tweaks, fixes
Syria 4W tweaks
Merge branch 'master' of https://github.com/flavour/eden

Conflicts:
	VERSION
	static/themes/Philippines/eden.min.css