Merge branch 'develop' into feature/videoTransferScript

Conflicts:
	setup/validActions.php

diff --cc setup/validActions.php
index 549a70b,b876500..6f71eed
--- 1/setup/validActions.php
--- 2/setup/validActions.php
+++ b/setup/validActions.php
@@@ -53,28 -54,27 +54,28 @@@ $glmMembersValidActions = array
          )
          ,
          'settings' => array(
-             'index'      => 'glm-member-db',            // Member Types
-             'categories' => 'glm-member-db',
-             'cities'     => 'glm-member-db',
-             'regions'    => 'glm-member-db',
-             'amenities'  => 'glm-member-db',
+             'index'                 => 'glm-member-db',            // Member Types
+             'categories'            => 'glm-member-db',
+             'cities'                => 'glm-member-db',
+             'regions'               => 'glm-member-db',
+             'amenities'             => 'glm-member-db',
          ),
          'management' => array(
 -            'index'                 => 'glm-member-db',            // General Options
 -            'terms'                 => 'glm-member-db',
 -            'development'           => 'glm-member-db',
 -            'theme'                 => 'glm-member-db',
 -            'import'                => 'glm-member-db',
 -            'addons'                => 'glm-member-db',
 -            'hooks'                 => 'glm-member-db',
 +            'index'       => 'glm-member-db',            // General Options
 +            'terms'       => 'glm-member-db',
 +            'development' => 'glm-member-db',
 +            'videos'      => 'glm-member-db',
 +            'theme'       => 'glm-member-db',
 +            'import'      => 'glm-member-db',
 +            'addons'      => 'glm-member-db',
 +            'hooks'       => 'glm-member-db',
          ),
          'shortcodes' => array(
-             'index' => 'glm-member-db'
+             'index'                 => 'glm-member-db'
          ),
          'error' => array(
-             'index'     => 'glm-member-db',
-             'badAction' => 'glm-member-db',
+             'index'                 => 'glm-member-db',
+             'badAction'             => 'glm-member-db',
          )
      ),
      'frontActions' => array(