Added mark-book-as-completed function, fixed timeline loading problems
Merged timeline changes with master