upgrade to use hibernate 4.2.11
Merge branch 'master' of https://github.com/dongzhesu/test