Bugfix map popups, supply index, Deploy uses country dropdown. IFRC deploy
uses per-disaster icons
Merge branch 'master' of git://github.com/flavour/eden