use config timeout to load resources
Merge branch 'develop' into js_timeout

Conflicts:
	views/templates/fsPreviewItemRunner.tpl
	views/templates/previewItemRunner.tpl
	views/templates/quickPreviewItemRunner.tpl
add timeout to the item runner
bump tao dep to 2.7.0