merged site, maven site config from test repo and some urls fixed