refactoring apps
refactoring ES
Merge branch 'refactoring'
fixing few issues
Merge branch 'master' of https://github.com/wso2/enterprise-store
fixing role creation issue