imran | BDSHR-375,0000 | pending approval paging and refactor.
Merge branch 'currentMaster'

Conflicts:
	src/Mci/Bundle/PatientBundle/Controller/PatientController.php
imran | 0000 | rename field ward to rural world and union to urban word