changes done
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/connector.xml
resources edited
Merge remote-tracking branch 'origin/master'