Changed the Camel-context.xml to read the credentials from the properties file.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/META-INF/spring/camel-context.xml
Removed used stuff.
Merge remote-tracking branch 'origin/master'