Bug Fix: Order Email CoffeeScript
Merge remote-tracking branch 'origin/prod' into prod