Merged dev branch to include AccountMemberShipProvider and AccountRoleProvider implementation