eclipse project files added, not sure if you should use them
Merge remote-tracking branch 'SCU/master'

Conflicts:
	SCU Terminal Emulator/.cproject
	SCU Terminal Emulator/.project