highlight fix attempt
Merge remote-tracking branch 'origin/master'

Conflicts:
	HTML5 test/public_html/spotFightMVP/spotFightView.js
Revert "highlight fix attempt"

This reverts commit 4202514f0397fdbf5b790399517d4c14dca0ad30.