some changes in Cart, Product and Session
Merge remote-tracking branch 'origin/master'