Cart js and controllert correct
Merge branch 'CartUpd'