Modified 
	- ClientThread
	- Server
		+ Add testDBConnection
Merge Dev_2 into Dev_1

Conflicts:
	src/Server/ClientThread.java
changed server to console only