Update and merge to entity manager
Merge branch 'master' of https://github.com/fredrikljung93/Twittbook

Conflicts:
	Twittbook/src/java/bo/Helper.java
	Twittbook/src/java/ui/UserBean.java