ranking page
Merge branch 'master' into greenmoon55
better shake handling