fix urls
Merge branch 'master' into openaid-dev
Merge branch 'openaid-dev' into openaid-staging