Forgot to add files :)
Merge branch 'master' of github.com:rsmeral/pv243-jboss

Conflicts:
	project/project-et-ejb/src/main/resources/META-INF/apache-deltaspike.properties
	project/project-et-ejb/src/main/resources/META-INF/persistence.xml
	project/project-et-web/pom.xml