added player coordinates to testDriver
Merge branch 'dev' into Improve-testDriver
Merge branch 'dev' into Improve-testDriver

Conflicts:
	src/server/controllers/Server.java
improvement to the test case and test runner
made some changes to testRunner/testCase
Merge branch 'dev' into Improve-testDriver

Conflicts:
	src/server/content/GridLoader.java
fixed conflict
Merge branch 'dev' into Improve-testDriver

Conflicts:
	src/server/controllers/Server.java
added timing to test files
removed unused imports
Merge branch 'dev' into Improve-testDriver
added and improved testCases
added comments and improved startGame wait loop
added testCases and removed test/ and .json from test files
Merge branch 'dev' into Improve-testDriver
changed filename
solved problem where tests would simply stop without exceptions
removed synchronized from serialize method

forgot to change it back before committing
moved player disconnection to testCase (when all clients are done)
Merge branch 'dev' into Improve-testDriver