increase waiting time for time out
Merge branch 'master' of https://github.com/groom-org/groom

Conflicts:
	com.c