Update license and readme
Update license terms
Merge branch 'develop' into gh-pages