resolving merge conflict of create.asset.js
Merge branch 'master' of github.com:wso2/enterprise-store