Merge origin/master

Conflicts:
	Desktop/Bingo/src/java/edu/mum/waa/beans/ItemBean.java