Товари оновлено
Merge remote-tracking branch 'origin/master'

Conflicts:
	backend/views/goods/_form.php