Fix TimeLines
Merge branch 'master' of github.com:Draveness/SportJoin