Merge origin/master

Conflicts:
	Desktop/Bingo/web/resources/css/styles.css