Merge branch 'product-template' of https://github.com/brianhall/material-design-lite into product-template
Conflicts: templates/product/images/top.jpg templates/product/index.html templates/product/styles.cssmaster
commit
79497c83ba
Conflicts: templates/product/images/top.jpg templates/product/index.html templates/product/styles.cssmaster