Unit test for CA
Corrected namespaces.
Merge branch 'master' of https://github.com/tobysaville/veda-hackathon2
Fix a merge problem.
Merge branch 'master' of https://github.com/tobysaville/veda-hackathon2

Conflicts:
	src/main/resources/META-INF/spring/camel-context.xml