Merge pull request #1 from wso2/master

Merging master repo with local repo
bs2 to bs3 migration started
Merge pull request #63 from hiranthadhanuka/master

BS2 to BS3 migration started