missingsputumresults calculation test concepts results added to test
data
adjusting controls on lab orders form
Merge remote-tracking branch 'upstream/master'
Form clean up and disabling controls instead of hiding them
rearrangement of things(javascript)
Merge pull request #33 from ningosi/master

minor changes on forms and test data
Merge branch 'master' of github.com:I-TECH/openmrs-module-kenyaemr

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