Update getErrorCategoryIdByName to use hibernate.
Update config file
add updates from master to branch
 update master changes to branch
Merge remote-tracking branch 'origin/master' into ErrorCategoryLookup

Conflicts:
	metadata/config.xml
Merge pull request #2 from CHIRDL-Openmrs-Modules/ErrorCategoryLookup

Update getErrorCategoryIdByName to use hibernate.