Cart component fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/components/cart/component.php
logIn fix
count fix