Updating license and how to build.
Merge branch 'master' into dev