Updated license
Merge branch 'develop' into integration/propel