Mostly completed sections K1-K6 of MOH711
Merge branch 'master' of github.com:I-TECH/openmrs-module-kenyaemr

Conflicts:
	api/src/test/resources/test-data.xml