Product, Cart
Merge branch 'master' of github.com:fupslot/kobyran-shop

Conflicts:
	public/js/common/directives/categories.dir.js
	public/js/core/home/home.tpl.html
	server/views/layouts/default.html
Merge branch 'master' of github.com:fupslot/kobyran-shop
Shoping Cart