Fixed
Merge branch 'webservice' of https://github.com/Happyness/social into webservice

Conflicts:
	Social/src/se/kth/backend/SocialApplication.java
	Social/src/se/kth/frontend/handler/PrivateMessagesHandler.java

Merged conflicts