Commiting changed before pull
Merge
Commit before merge
Merge branch 'master' of https://github.com/sitemavens/maven-common

Conflicts:
	app/core/cart.php
Commit
Merge branch 'master' of https://github.com/sitemavens/maven-common
commit
Local Commit
Added Orders to the profile view