Merge branch 'master'
правка карточки тавара
Merge branch 'alexey'
правка 16.05
Merge branch 'alexey'
Merge branch 'github.com_alexey/master'