[r125] [trunk/MobileMRSNoPolish] Prepare to merge our code base with the CellLife code base
[r125] [trunk/MobileMRSNoPolish] Prepare to merge our code base with the CellLife code base

dimagi/commcare,dimagi/commcare,dimagi/commcare,dimagi/commcare-core,dimagi/commcare-core,dimagi/commcare-core