Refactoring
Merge branch 'master' of https://github.com/Turantul/sa_group9

Conflicts:
	server/src/main/java/sa12/group9/server/rest/PeerService.java