changes to timeline by papazock
Merge remote-tracking branch 'origin/master'