Merge branch 'dooug-completed-emails' into beardbalm
add gift order checkbox