adding generics to work with cdi 1.2
Merge pull request #917 from caelum/adding_generics_to_cdi_1.2

Adding generics to work with CDI 1.2