Working on errors
Merge branch 'master' of github.com:dulichan/wso2store