use config timeout to load resources
Merge branch 'develop' into js_timeout
add timeout to the delivery template