merge conflict
merge conflict

RainerAtSpirit/so16363046,RainerAtSpirit/detachIssue,dFiddle/dFiddle-2.0,RainerAtSpirit/djODataAPIExplorer,RainerAtSpirit/Durandal-Fiddle,RainerAtSpirit/dSortable,navels/dFiddle-2.0,navels/dFiddle-2.0,dFiddle/dFiddle-2.0