fix merge conflicts with JonDum's patch
fix merge conflicts with JonDum's patch

timruffles/ios-html5-drag-drop-shim,trenthogan/ios-html5-drag-drop-shim,timruffles/ios-html5-drag-drop-shim,xStrom/ios-html5-drag-drop-shim,xStrom/ios-html5-drag-drop-shim,trenthogan/ios-html5-drag-drop-shim