Merge branch 'promo' into staging
marking groupon codes as used upon order completion
Merge branch 'engraving'
adding product to cart still allows for engraving
Merge branch 'engraving' into staging
Merge branch 'engraving'
mixed case and positionable text
Merge branch 'engraving' into staging
Fixed user cannot start checkout process with engraving text empty
Merge branch 'engraving'
Merge pull request #7 from MFRWDesign/engraving

Fixed user cannot start checkout process with engraving text empty
adding proximo google tags; brand & product pages done
adding proximo google tag to cart
proximo google tag for registration
proximo google tags for confirmation
Added brands_controller and associated views
removing datalayer from google tags
removing floodlight tags for proximo
Merge branch 'no_fl_proximo'
Merge branch 'proximo'