fixed discount for all options and added js and css for jasny controls
Merge branch 'odell'
Merge remote-tracking branch 'GitHub/master'
Removed extra Discount headers and fixed bug if fieldID was null