Added license.
Merge branch 'develop'