need to send wait to user
Merge remote-tracking branch 'origin/socket_trials' into socket_trials

Conflicts:
	src/main/java/server/base/Frontend.java
	src/main/resources/dbaccess.xml