Readjusted short product view
Merge branch 'master' of https://github.com/toivs03/GiftCertificates-Redemption
Figured out tabs for category description area
Added "Redeeming Your Super Certificate" link.  Consolidated static page controllers into one, removed others.
Merge branch 'master' of https://github.com/toivs03/GiftCertificates-Redemption
Styled the category list and product list layout/hover animations
Merge branch 'master' of https://github.com/toivs03/GiftCertificates-Redemption
Added merchant filtering on search
Merge branch 'master' of https://github.com/toivs03/GiftCertificates-Redemption