asdasd
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/demo/GuestBean.java
	web/index.xhtml
xcvcxv