commiting rapidsms_ureport
[Argha/DJ][Paul] moving local customisations for South Sudan over to a branch
[nim, jmdb] Putting south sudan on the map
[Argha] removing redundant migration for ureport models
[nim, jmdb] Making it retrieve the south sudan layer
[nim, argha] Fixed and refactored OpenLayers logic in  mapping javascript
[nim, argha] Moving export_locations_to_db into ureport management command as import_csv_locations
[nim] Making import locations script require the locations hierarchy csv file as an argument
[nim] Cleaning up
[nim] resolving merge conflicts one file at a time. Resolving tasks.py
[nim] Resolving merge conflicts in urls.py
[nim] REsolving merge conflicts in 0004_migration_initial_data.json
[nim] Resolving master-sudan branch merge conflicts in models/litseners.py
[nim] Resolving master/sudan merge conflicts
[nim, chris] Resolcing merge between master and sudan
[nim, chris] Resolving merge conflict between uganda and south sudan
[nim, ctford] Fixing error in ureport/urls.py caused by incorrect merge of master with sudan
[nim, ctford] Correcting ureport layout to remove NATIONAL PULSE for south sudan.
Merge branch 'master' into south_sudan
[nim, dj] Making mulitchoce_choropleth show south sudan map