Sravanthi, Indraneel | #1195 | integrating new lab results and drug order API with pivot table service
Merge branch 'master' of https://github.com/Bhamni/bahmni-core

Conflicts:
	bahmnicore-ui/src/main/java/org/bahmni/module/bahmnicoreui/service/impl/BahmniDiseaseSummaryServiceImpl.java