Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	elastic-camel/.classpath
	elastic-camel/.project
	elastic-camel/pom.xml