Facebook
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	sentimentanalyzer/pom.xml
	sentimentanalyzer/src/main/resources/camel-config.xml
quickfix