fix rmi bug
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/config
	src/mapreduce/JobTracker.java
	src/mapreduce/TaskTrackerUpdatePkg.java