update Entity
Merge branch 'master' of github.com:HelgIn/School

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	client/client.iml
	client/src/main/java/com/school/Client.java
	client/target/classes/com/school/Client.class
	common/common.iml
	server/server.iml
	server/src/main/java/com/school/ServerTest.java
	server/src/main/java/com/school/ServerThread.java