Merge from develop

diff --cc controllers/admin.php
Simple merge

diff --cc lib/GlmDataAbstract/DataAbstract.php
Simple merge

diff --cc models/admin/member/memberInfo.php
Simple merge

diff --cc models/admin/members/list.php
Simple merge

diff --cc setup/validActions.php
index 2684dbf,fd9980c..9065483
--- 1/setup/validActions.php
--- 2/setup/validActions.php
+++ b/setup/validActions.php
@@@ -33,27 -33,22 +33,28 @@@
  $glmMembersValidActions = array(
      'adminActions' => array(
          'ajax' => array(
 -            'imageUpload'         => 'glm-member-db',
 -            'fileUpload'          => 'glm-member-db',
 -            'newOldMemberIdsCsv'  => 'glm-member-db',
 -            'membersListExport'   => 'glm-member-db',
 -            'memberClickThrough'  => 'glm-member-db',
 -            'memberDetailClick'   => 'glm-member-db',
 -            'memberGraphs'        => 'glm-member-db',
 -            'fileLibraryUpload'   => 'glm-member-db',
 -            'fileLibraryDownload' => 'glm-member-db',
 -            'fileLibraryDelete'   => 'glm-member-db',
 -            'fileLibraryUpdate'   => 'glm-member-db',
 -            'glmCron'             => 'glm-member-db',
 -            'membersMapData'      => 'glm-member-db',
 -            'citiesMapData'       => 'glm-member-db',
 -            'countiesMapData'     => 'glm-member-db',
 +            'imageUpload'           => 'glm-member-db',
 +            'fileUpload'            => 'glm-member-db',
 +            'newOldMemberIdsCsv'    => 'glm-member-db',
 +            'membersListExport'     => 'glm-member-db',
 +            'memberClickThrough'    => 'glm-member-db',
 +            'memberDetailClick'     => 'glm-member-db',
 +            'memberGraphs'          => 'glm-member-db',
 +            'fileLibraryUpload'     => 'glm-member-db',
 +            'fileLibraryDownload'   => 'glm-member-db',
 +            'fileLibraryDelete'     => 'glm-member-db',
 +            'fileLibraryUpdate'     => 'glm-member-db',
 +            'glmCron'               => 'glm-member-db',
-             'membersMapData'      => 'glm-member-db',
-             'citiesMapData'       => 'glm-member-db',
-             'countiesMapData'     => 'glm-member-db',
++            'membersMapData'        => 'glm-member-db',
++            'citiesMapData'         => 'glm-member-db',
++            'countiesMapData'       => 'glm-member-db',
 +            'glmTextSearch'         => 'glm-member-db',
 +            'adminSearch'           => 'glm-member-db',
 +            'memberManagement'      => 'glm-member-db',
 +        ),
 +        'manageDashboard' => array(
 +            'members' => 'glm-member-db',
+             'membersList'         => 'glm-member-db',
          ),
          'dashboard' => array(
              'index'   => 'glm-member-db',