fixed qty on cartView
Merge branch 'master' of https://github.com/Mmiller44/akero

Conflicts:
	CodeIgniter_2.1.4/application/models/database.php