sdfa
Merge branch 'master' of https://github.com/zamly/feedlyESBconnector

Conflicts:
	org.wso2.carbon.connector/.idea/workspace.xml