coomite from pc
Merge branch 'master' of https://github.com/min2das/hibernate.git

Conflicts:
	hibernate/.gitignore
commit from pc