Hibernate again
Merge branch 'master' of https://github.com/NCIP/national-biomedical-image-archive