expanding draggable/droppable
Merge branch 'chris'