correct link to license.html
Merge branch 'master' into gh-pages