Merge branch 'master' of github.com:flavour/eden
Merge branch 'master' of github.com:flavour/eden
Merge branch 'master' of github.com:flavour/eden
Tests for Survey Templates
Merge pull request #834 from graeme-f/master

Tests for Survey Templates
OCHA ROCCA
*Support Non-numeric PCodes
*Fix gis_location_tag component definitions
*Supported updates of other languages
*Show PCodes on Demogrpahics, Baseline & Disasters
Cleanup
Merge branch 'master' of github.com:flavour/eden
MCOP: Marker for Alerts
MCOP: Add Satellite Layer, Disable PoIs
Merge branch 'master' of github.com:flavour/eden
Add site_id and key responsibilities fields to hrm_experience
Map: ZoomToMaxExtent zooms to restrictedExtent
Fig bux.
Merge branch 'master' of git://github.com/nursix/eden
* Eden specific robot framework library, other small changes

* A function in default controller to respond

* Authorization for EdenTest