1. added license
1. modified license
Merge branch 'develop'