Add a license finally
Merge branch 'develop'