changes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	ClientApp/bin/.gitignore
	ServerApp/src/main/java/DAL.java
	ServerApp/target/classes/DAL.class
	ServerApp/target/classes/ServerWebSocketHandler.class
	ServerApp/target/classes/testDal.class