Update from matt
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/model/bean/EventBean.java