Fixed NPE on details page
Configure page adjustments
Fixed error reporting
Merge branch 'master' of github.com:openmrs/openmrs-module-openconceptlab
Corrected conflicts
Conflicts:
	omod/src/main/java/org/openmrs/module/openconceptlab/fragment/controller/DetailsFragmentController.java
	omod/src/main/webapp/pages/configure.gsp