update docs on resource configuration
Merge branch 'master' into devel
more fixes on unittest timings...