Trying to fix hibernate issues
Merge branch 'schoenmh/captControll' of github.com:cs27x/GroupPic into schoenmh/captControll