Merge pull request #47 from wso2-dev/master

Merge pull request #34
Correcting schema terminology and cleaning up context menu
Merge pull request #64 from Gayany/master

Correcting schema terminology and cleaning up context menu