Pull in fix to the reporter listing page (a revert).
included the friday after independence
Pull in fix to bug that double-schedules polls to P3 and P6.
First day of polls delayed by a day.
Pull in fix to recently reported calculation.
Remove deprecated option.
Re-remove rapidsms_edtrac and rapidsms_httprouter to resolve merge conflicts.
[Emily, Chris] Remove rapidsms_geoserver submodule.
[Emily, Chris] Merge the rapidsms_geoserver submodule into the main repository.
[Emily, Chris] Remove rapidsms_httprouter submodule.
[Emily, Chris] Merge rapidsms_httprouter submodule into the main repository.
[Emily, Chris] Fix the location of the http router former-submodule for backwards compatibility.
[Emily, Chris] Erased rapidsms submodule
[Emily, Chris] Merging the rapidsms module with the edtrac_project
Delete rapidsms_unregister submodule.
Merged rapidsms_unregister into the main repository.
Remove rapidsms_generic submodule option.
Merge rapidsms_generic submodule into the main respository.
Remove rapidsms_uganda_common submodule option.
Merge rapidsms_uganda_common submodule into the main repository.