bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	OnlineHoldemServer/src/main/webapp/index.html
bug fixes