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
ADAT - Add widget to the date and time question types
S3LocationSelectorWidget2: Change Lx hierarchy names depending on country
selected.
Merge branch 'master' of git://github.com/graeme-f/eden
Merge branch 'master' of git://github.com/nursix/eden