Fixed conflict with angular drag-n-drop plugin
Merge pull request #34 from sjorobekov/master

Fixed conflict with angular drag-n-drop plugin