Merge remote-tracking branch 'origin/generate-proxy-with-annotation'
fix README.md
Merge branch 'master' of https://github.com/guhilling/cdi-test.git
fix problem with deltaspike (?)
fix README.md