Replaced placeholders in license.
Merge branch 'origin/develop'