Merge branch 'develop'
Merge branch 'develop'
license update
Added Solutions tag
Merge branch 'master' into develop