Reconcile build.properties
Reconcile build.properties

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