#1720: Renaming and refactoring
#1720: Showing paper or scanned for digitization status
Merge branch 'master' of https://github.com/Bhamni/openmrs-module-bahmniclinical into 1720