Merge tag 'v2.6.2' into develop

Version 2.6.2

diff --cc models/admin/pages/shortcode.php
index 8826e83,06a09eb..8bf2adc
--- 1/models/admin/pages/shortcode.php
--- 2/models/admin/pages/shortcode.php
+++ b/models/admin/pages/shortcode.php
@@@ -144,9 -144,8 +144,9 @@@ class GlmMembersAdmin_pages_shortcod
  
          $listAttr   = $this->config['addOns']['glm-member-db']['shortcodes']['glm-members-list']['attributes'];
          $detailAttr = $this->config['addOns']['glm-member-db']['shortcodes']['glm-member-detail']['attributes'];
 +        $featuredAttr = $this->config['addOns']['glm-member-db']['shortcodes']['glm-member-featured']['attributes'];
          $glmcat     = new GlmDataCategories( $this->wpdb, $this->config );
-         $categories = $glmcat->getListSortedParentChild();
+         $categories = $glmcat->getList('', 'T.name');
  
          // get the each addOn slugs to pass to the config array later
          $addOns = $this->config['addOns'];