Merge branch 'SpryflashMaster'
Added clocktimer interface to clocktimercontroller
Merge remote-tracking branch 'upstream/master'
ClockTimerImplementation