коммит перед добавлением купонов
Merge branch 'develop' into feature/art

Conflicts:
	protected/modules/feedback/FeedbackModule.php
	protected/modules/shop/controllers/CartController.php
	protected/modules/shop/models/Order.php
	protected/modules/shop/models/Product.php
	protected/modules/shop/views/assets/js/shop.js
Merge branch 'develop' into feature/art
Merge branch 'develop' into feature/art
коммит перед слиянием
Merge branch 'develop' into feature/art
ImageUploadBehavior - ресайз изображений при загрузке