upgraded hibernate and spring
Merge branch 'master' into spring4
Merge branch 'spring4'