Added license info
Merge branch 'master' into license-and-docs