socioboard hibernate file deleted
Merge branch 'master' of https://github.com/socioboard/socioboard

Conflicts:
	SocioBoard/Socioboard/hibernate.cfg.xml