Hibernate config
Merge branch 'master' of https://github.com/fredrikljung93/Twittbook

Conflicts:
	Twittbook/nbproject/genfiles.properties
	Twittbook/src/java/ui/LoginBean.java