Working Drag and Drop Zones
Merge remote-tracking branch 'origin/master'