Resolve the conflict
Merge branch 'master' of https://github.com/tienwei/oddsAre-UI-Polishing