created beans
created beans
Merge origin/master
Merge origin/master

Conflicts:
	Desktop/Bingo/web/register.xhtml
Merge origin/master

Conflicts:
	Desktop/Bingo/web/register.xhtml
Merge origin/master
Merge origin/master

Conflicts:
	Desktop/Bingo/web/register.xhtml
Merge origin/master

Conflicts:
	Desktop/Bingo/web/register.xhtml
	Desktop/Bingo/web/login.xhtml