Updated tables for handling daily deals
Paperclip Changes and Conflicts Fixed
Fixed Conflicts
changed according to paperclip gem