Fixes
Merge branch 'master' of https://github.com/Happyness/social.git

Conflicts:
	Social/src/se/kth/model/bo/User.hbm.xml

Fixed merged manually ....