small refactor
Merge branch 'master' of https://github.com/GRAAFYME/ContainingJ2P2P
xml parsing code
Merge branch 'master' of https://github.com/GRAAFYME/ContainingJ2P2P

Conflicts:
	p2p/server/src/test/java/org/server/JunitTest.java