Finishing the new main menu
Merge branch 'master' of https://github.com/getshop/applications
Fixed a bug