ФенШуЙ
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/cart/templates/show_cart.jinja2.html
	db/shop_mk_ua.sqlite3