Merge remote-tracking branch 'origin/TerminalsUI1.2' into TerminalsUI1.2

Conflicts:
	index.html