[Tong] Merge local code
Merge branch 'master' of github.com:jiukunz/angular-leaderboard-sample
Merge branch 'master' of github.com:jiukunz/angular-leaderboard-sample
Merge branch 'master' of github.com:jiukunz/angular-leaderboard-sample
[Tong] Refactor calculate time diff in controller.js
[Tong] Refactor calculate time diff in controller.js and merge local