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

Conflicts:
	controller/main.js
Merge remote-tracking branch 'origin/TerminalsUI1.2' into TerminalsUI1.2

Conflicts:
	controller/main.js