change simpleRegistry
Merge branch 'master' into jianw_dev

Conflicts:
	src/server/SimpleRegistry.java