Updated composer.json

Conflicts:

	composer.json
ummmm

Conflicts:

	modman
Fixed Noticed: undefined offset when cart only have virtual products

Conflicts:

	app/code/community/CVM/GoogleTagManager/Block/Gtm.php