Fixes
Merge branch 'master' of https://github.com/KeithSpiteri/Software.Testing

Conflicts:
	src/main/webapp/bet.jsp