Merge branch 'master' into live
Changing names of leaderboard links in dropdown
Merge branch 'master' into live
Adding olypmic weightclasses
Merge branch 'live'