Merge branch 'identities' into encryption

Conflicts:
GDCN_proj/Client/src/main/java/control/PeerOwner.java
GDCN_proj/Client/src/main/java/network/Passer.java
GDCN_proj/Client/src/main/java/network/TaskPasser.java
Resolved merge conflicts