Added groupID to Contact_Group and modified the filter and prefixTree
Merge remote-tracking branch 'origin/master'