Updated application and terminal to use edit controls
Merge branch 'marc' into dev

Conflicts:
	main.cpp