added weld dependencies
merges
removed listeners from web.xml
Merge branch 'master' of github.com:echevreuil/catalogo
cdi listener to inject entity manager