Client: Renamed variables
Merge branch 'master' of https://github.com/GRAAFYME/ContainingJ2P2P

Conflicts:
	p2p/client/src/main/java/org/client/Client.java
	p2p/client/src/main/java/org/client/Crane.java
	p2p/client/src/main/java/org/client/Scene.java
	p2p/client/src/main/java/org/client/Storage.java