License added.
Merge branch 'refs/heads/dev'
Merge branch 'refs/heads/master' into dev