Conflicts:
	src/GUI/ClientApp.java
merge