add basket and fix menu
fix external link
Merge branch 'master' into project