Merge origin/master

Conflicts:
	Desktop/Bingo/web/sections/main/searchBar.xhtml
Merge origin/master