works basket (angularjs)
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/modules/basket/views/basket.client.view.html
result of merging