Merge pull request #27 from candyforchris/master

updated timeline api
updated speech controller
Merge remote-tracking branch 'origin/master'
not crashing any more
Merge pull request #28 from vossgang/matt-copy

Matt copy
timelineAPI change