Update for frictional contacts#2184

khofmann6 wants to merge 3 commits intoglotzerlab:trunkglotzerlab/hoomd-blue:trunkfrom

khofmann6:fix_frictional_contacts_2dkhofmann6/hoomd-blue_frictional_contact:fix_frictional_contacts_2dCopy head branch name to clipboard