add taskType to the status report
Merge branch 'master' into wj_dev

Conflicts:
	MapReduceAndDFS/src/mapreduce/TaskStatus.java