MCOP: Disable location_id in InlineWidget as won't work there. Add UN risk
layers to map
Disable correct bit
Use requirements.txt for managing python dependencies
Merge pull request #749 from gnarula/master

Use requirements.txt for managing python dependencies
Cleanup
microfix for a million problems e.g. ticket 1525: re-encode url query
values as utf-8 after split-recombine, also update drmp newsfeed
controller to new customisation setting
MCOP: Use US locale settings, IFRC: Settings for Afghanistan Red Crescent
Merge pull request #750 from nerdis/master

microfix for a million problems e.g. ticket 1525: re-encode url query
Merge branch 'master' of github.com:flavour/eden