fixed CSS part 3
Merge origin/master

Conflicts:
	View/viewCart.php
View/viewCart.php
Merge origin/master