Working on deletion of individual timers
Merge remote-tracking branch 'origin/master'
Individual timers may now be deleted