Fixes to the controller
Merge branch 'demo' of github.com:dulichan/wso2store into demo