minor fixes
Merge remote-tracking branch 'origin/socket_trials' into socket_trials

Conflicts:
	src/main/resources/testDB.xml
	src/test/java/server/dao/UsersDAOTest.java