just test
Merge branch 'master' into yuzen

Conflicts:
	Server/.classpath
	Server/src/Monitor.java
	Server/src/Position.java
	Server/src/Setting.java
meger1