Add to shopping cart
Shopping cart update
Merge branch 'v2'
Merge remote-tracking branch 'origin/master' into kushan

Conflicts:
	Chef.meV2/Chef.meV2.xcodeproj/project.pbxproj