Fixed setup
Merge branch 'master' of github.com:openmrs/openmrs-module-openconceptlab

Conflicts:
	api/src/main/java/org/openmrs/module/openconceptlab/UpdateService.java