last commit before webdone demo
comment rules in sample before webdone demo
minor change time out in thcat updates
Merge commit '684b8705efa260704422e0e37e73cfc7af474574'

Conflicts:
	config/scenario/samples/query/sample.yml