Merge branch 'test_client' into 'test_client_stsc'

# Conflicts:
#   VadereManager/src/org/vadere/manager/client/TestClient.java
9 jobs for test_client_stsc in 214 minutes and 4 seconds (queued for 3 seconds)