Merge branch 'master' of https://github.com/Nohbody/serverTime into Nohbody-master

Conflicts:
	src/Snake/GameApplet.java
	src/Snake/src/GameApplet.java
	src/collector/src/tileMapStuff/Entity.java
	src/collector/src/tileMapStuff/Game.java
	src/collector/src/tileMapStuff/Map.java
	src/gui/GUI.java
	src/gui/LoginPanel.java
	src/gui/MenuPanel.java
	src/main/DBOps.java
	src/main/Driver.java
	src/main/Listener.java
	src/main/TestPanel.java
	src/snake/GameApplet.java