Merge pull request #1254 from anandpdoshi/4.0.0-shopping-cart-wip

Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixe...