Merge branch 'master' into display-search-authors
Merge branch 'master' of github.com:Connexions/webview
Merge remote-tracking branch 'origin/master'
add stanzas to redirect resources to presumed archive url
Merge pull request #92 from Connexions/resource-nginx-config

Resource nginx config