Merged branches

Merged leaderboard changes with location changes. A bit crashy in an
emulator, and UI changes need to be made.