Merge remote-tracking branch 'origin/master'

Conflicts:
	HTML5 test/public_html/spotFightMVP/spotFightPresenter.js