Resolving Conflicts
Resolving conflicts with librabries
Merge branch 'version_two'

Conflicts:
	project.properties
	src/org/grameenfoundation/adapters/CoverageListAdapter.java
Resolved conflict with libraries
ANC Diagnostic tool new changes implementation
ANC Diagnostic tool changes
Postnatal Care Counselling Tool Implementation
PNC counselling tool implementation
PNC Counselling implementation
Final Commit before merging into version_two
Removing staying well files
Merge remote-tracking branch 'origin/version_two'

Conflicts:
	assets/www/cch/modules/stayingwell/index.html
	project.properties
images for anc
interfaces for anc counselling topics and referrences
Implemented Diagnostic tool for mother and usage tracking for point of
care
Merge branch 'master' of https://github.com/GrameenGhana/cch-android.git
Merge remote-tracking branch 'origin/version_two'

Conflicts:
	assets/www/cch/modules/stayingwell/templates/legal.html
	src/org/digitalcampus/oppia/application/DbHelper.java
Resolving conflicts
Merge remote-tracking branch 'origin/master' into version_two
Implementing changes for staying well display and target updates glitch