added reconnection in case server shuts down
Merge branch 'master' of https://github.com/yasserlamsaougar/SR_Project

Conflicts:
	src/client/GameLauncher.java
	src/client/GameManager.java
	src/client/GameScreen.java
	src/client/KeyboardEventCatcher.java
	src/client/Player.java
	src/server/ServerLauncher.java
	src/server/ServerService.java
	src/server/ServiceImplementation.java
	src/shared/CONSTANTS.java