changed template url in a vain attempt to let this function with gh-pages
Merge branch 'master' into gh-pages