CDI: Using own annotation.
Merge branch 'master' of https://github.com/zuehlke-hae/camp