refactoring apps
fixing conflict
fixing issues
Merge branch 'master' of https://github.com/wso2/enterprise-store
fixing tenant switching issues
Merge branch 'master' of https://github.com/wso2/enterprise-store
fixing tenant store loading issue
fixing issues