Merge branch 'master' into promo
Merge branch 'glen-tags'
Merge branch 'promo'
merging branch no_eng
adding new fonts
removing the split method from query set in Spree code
fixing indentation
Merge branch 'full-match-search'
allows admins to edit text for custom engraving
allows number of lines for engraving text to be set by admin for each
product - default to 3 lines
ensures number of lines for engraving on product detail page matches the
product's settings for number of lines that should be available for
engraving
converting font style to string, in case it does not exit, it will not throw an error
fixing product detail page with new line_number info
fixes issue causing engraving text to updated/displayed incorrectly
ensures engraving text honors product settings for whether that text
should be uppercase or not
Merge pull request #23 from ReserveBar1/admin-can-edit-engraving-text

Admin can edit engraving text
comments out engraving_font_style stuff for now
Merge pull request #24 from ReserveBar1/comment-out-engraving-font-style

comments out engraving_font_style stuff for now
merging master branch