order review page
sas
resolved conflict
resolve conflict
Resolved conflict
Merge branch 'master' of https://github.com/bhupeshg/estore

Conflicts:
	app/Controller/Component/AuthorizeNetComponent.php
	app/Controller/UsersController.php