Some fixes and new features
Some fixes and new features
rest class added
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/components/cart/component.php