Issues related to clinical encounter is addressed here. We only display
list of option relevant to the family planning option as per the drop
down.
Merge branch 'master' of github.com:ningosi/openmrs-module-kenyaemr

Conflicts:
	api/src/main/java/org/openmrs/module/kenyaemr/KenyaEmrActivator.java