add product in home template
Merge branch 'master' into layout-home
Setting layout home
Merge branch 'layout-home'
resolve conflict