upgraded to JPA 2.1
upgrade servlet to 3.1, ejb to 3.2
upgraded to cdi 1.1
Merge pull request #103 from kir-dev/javaee7-descriptor-upgrade

JavaEE 7 upgrade