argtypes repair
Merge branch 'jianw_dev'

Conflicts:
	src/comm/RMIMessage.java
argtypes
fix argType