Frontend header
Merge branch 'master' of https://github.com/sonbui00/magento-mock

Conflicts:
	app/design/frontend/rwd/sm/template/sm/slider/slider.phtml