Merge remote-tracking branch 'upstream/master'
Handles cross-domain iframe paste issue, as well as addressing a recent jQuery bug with replacdWith(). Fixes issue #56
resolved merge conflict
merge conflict
fix