Communication from gui to server
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/Adapter/MainAdapter.java
Merging me and Sylwek