Merge branch 'master' of https://github.com/pluto-/GCom

Conflicts:
	client/src/client/Client.java
Merge branch 'master' of https://github.com/pluto-/GCom

Conflicts:
	client/src/client/Client.java
Merge branch 'master' of https://github.com/pluto-/GCom
Merge branch 'master' of https://github.com/pluto-/GCom

Conflicts:
	client/src/client/Client.java
Merge branch 'master' of https://github.com/pluto-/GCom

Conflicts:
	core/src/main/java/gcom/GCom.java
	core/src/main/java/gcom/communicator/Communicator.java
	core/src/main/java/gcom/messagesorter/MessageSorter.java
Merge branch 'master' of https://github.com/pluto-/GCom

Conflicts:
	core/src/main/java/gcom/GCom.java
	core/src/main/java/gcom/communicator/Communicator.java
	core/src/main/java/gcom/messagesorter/MessageSorter.java
Merge branch 'master' of https://github.com/pluto-/GCom