Fixed bug to allow draggable directive to work on groups
Refactored add group directive to use group2 data structure