changes in view shopping cart page and login page.
just commit
Merge branch 'master' of https://github.com/infotechnab/smartaservice

Conflicts:
	application/controllers/cartDetails.php
	nbproject/private/private.xml