Merge pull request #4 from phamhathanh/master

timer
-----Other-----
- Uniform data structure
- User dataService & restService to loading data
-----Function -----
- Update UI for leaderboard
Merge branch 'master' of https://github.com/DinhNgocAnh/akira

Conflicts:
	view/_shared/leaderboard.html
Merge pull request #5 from hungnm-ict/master

-----Function -----
kanji fix