Mujir, Vikash | Retrospective changes.
Merge branch 'retrospective-encounter' of https://github.com/Bhamni/openmrs-module-bahmniapps into retrospective-encounter

Conflicts:
	ui/app/common/patient-search/controllers/patientsListController.js