Фівкс Goods
Фівкс Goods 2
Merge branch 'Spellbinder'

Conflicts:
	backend/controllers/GoodsController.php
	backend/views/goods/_form.php
	backend/widgets/TableField/assets/js/TableField.js
	common/models/Catalog.php
	common/models/Colors.php
	common/models/Goods.php
	common/models/Palette.php
Фівкси/Марджинг
Merge remote-tracking branch 'origin/master'