included current location so that openmrs model should not crash
updated to reflect changes made to other files
Merge branch 'master' of github.com:BaobabHealthTrust/bart2