Merge remote-tracking branch 'origin/master'

Conflicts:
	UI-HTML/index.html