Added "All" option to Merchant filter
layout fix for tablet portrait on categoryView.html
Merge branch 'master' of https://github.com/toivs03/GiftCertificates-Redemption
Added GC Bootstrap colors to custom.css and adjusted search to work properly.