Update
Add new Bean
1
Merge branch 'twobean'

Conflicts:
	ejb3-all_in_one-glassfish/src/main/webapp/WEB-INF/web.xml
	ejb3-all_in_one-glassfish/src/main/webapp/index.html