Refactor S3ResourceFilter to support S3ResourceQuery transformations.
S3LocationSelectorWidget2 supports multi-country (no hierarchy label
changes yet), SY/LB L1 names, Rename flood module as water, Syria template
updates
Merge branch 'master' of git://github.com/nursix/eden