Merge pull request #114 from LI-HE/master

ranking update for badges #3
change story app-test.js
Cleaning up menus and routing
Merge pull request #34 from ChrisBoesch/master

update