Working on client
Merge remote-tracking branch 'origin/connection_pool' into connection_pool

Conflicts:
	src/test/DbConnectorManagerImplTest.java