Deleting TimeLine and TimeLineProvider
Merge branch 'master' of https://github.com/vdean/Gatas
Merging Evan's commit