added cart functionality
merge branch 'master' into aw-browse-page
finished with feature
tuferge branch 'master' into aw-browse-page

 tufjdkdklhe commit.
Merge branch 'master' into aw-browse-page
Merge branch 'aw-browse-page'