Merge Rogers changes
Roger: Add ADC, Statemachine and LCD Driver