Fixed annoying hibernate issue
Merge remote-tracking branch 'origin/master'

Conflicts:
	Social/src/se/kth/model/dao/PrivateMessageDao.java
	Social/src/se/kth/model/dao/UserLogMessageDao.java

Merged conflicts