add cart
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	res/layout/l_basket_frame.xml