update model version
update model version
Merge branch 'master' into 'Hibernate4'