#4998: TerminalView changed to ProcessView.
Merge branch 'devel' of https://github.com/OSLL/sca into devel

Conflicts:
	src/MainWindow.cpp
	src/MainWindow.h