add max retry count for StatusUpdate
reduce complete task num
add offer/staging timeout
Merge branch 'master' into github

Conflicts:
	src/master/master.cpp