Changed openmrs version to 1.9.7 in pom.xml; fixed compatibility issues in tests
Merge pull request #25 from albertsaave/master

Changed openmrs version to 1.9.7 in pom.xml; fixed compatibility issues ...
Merge branch 'master' of github.com:openmrs/openmrs-module-mergeconcepts