aaaa
a
Merge branch 'EJB2bra'

Conflicts:
	TestEJBWeb/WebContent/index.jsp