Merge remote-tracking branch 'origin/master4'

Conflicts:
	src/network/ServerSubmitter.java
	src/solutions/Main.java
	src/solutions/Solver.java