Merge Chamath into master
Merge janaka into master
Create Merge.jsos
Merge pull request #162 from wso2connector/master