from merge
from merge
fix for fletch putting quites around id attribute
got twitter working with better messaging and only sends when in production env
resolved merge conflicts in creative.js
Merge remote-tracking branch 'upstream/master'