Merge origin/master

Conflicts:
	Desktop/Bingo/src/java/edu/mum/waa/beans/ItemBean.java
	Desktop/Bingo/web/index.xhtml
	Desktop/Bingo/web/resources/css/styles.css
	Desktop/Bingo/web/sections/items/indexList.xhtml
Merge origin/master

Conflicts:
	Desktop/Bingo/src/java/edu/mum/waa/beans/ItemBean.java
	Desktop/Bingo/web/index.xhtml
	Desktop/Bingo/web/resources/css/styles.css
	Desktop/Bingo/web/sections/items/indexList.xhtml
Merge origin/master