Serial Inputs Atlas
merge
Merge branch 'SpryflashMaster'

Conflicts:
	Config.h
	Framework/GUIServer.cpp
	Framework/GUIServer.h
	Sensors/SerialInput.cpp
	Sensors/SerialInput.h
	main.cpp