changes in catalog.xml by nilesh
Merge branch 'origin/master'
Merge branch 'origin/master'
changes in shipping.phtml,shippicker.phtml by nilesh
Merge branch 'origin/master'
changes in text.phtml,media.phtml by nilesh