a little refactoring
the connection pool to client database was changed
test conn pool
Merge branch 'Development'

Conflicts:
	app/com/shopservice/DatabaseManager.java
	app/com/shopservice/Services.java