Merge origin/master

Conflicts:
	ScoreTracker/web/index.xhtml