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

Conflicts:
	Social/src/se/kth/backend/resource/AuthServerResource.java
	Social/src/se/kth/backend/resource/PrivateMessageServerResource.java
	Social/src/se/kth/backend/resource/UserServerResource.java
	Social/src/se/kth/common/model/bo/User.java
	Social/src/se/kth/frontend/handler/ClientHandler.java
	Social/src/se/kth/frontend/handler/ProfileHandler.java
	Social/src/se/kth/frontend/handler/WallHandler.java

Merged a lot