Added license to plugin.xml
Merge branch 'develop'