merge del manifest
Merge branch 'master' of https://github.com/IIIRepublica/android-civicrm.git
Merge branch 'master' of https://github.com/IIIRepublica/android-civicrm.git