Merge pull request #16 from wso2/master

wso2 master- wso2 dev
Merge pull request #36 from wso2-dev/master

sucessfully commited the changes
Timestamp : Fri Dec 12 11:05:36 IST 2014
https://wso2.org/jenkins-pr-builder/job/carbon-platform-integration/474/