Merge branch 'MDL-62229-master' of git://github.com/jleyva/moodle

diff --combined admin/tool/mobile/classes/api.php
index 43c8464,34f6533..d6c88c3
--- 1/admin/tool/mobile/classes/api.php
--- 2/admin/tool/mobile/classes/api.php
+++ b/admin/tool/mobile/classes/api.php
@@@ -277,7 -277,6 +277,7 @@@ class api 
              $settings->tool_mobile_customlangstrings = get_config('tool_mobile', 'customlangstrings');
              $settings->tool_mobile_disabledfeatures = get_config('tool_mobile', 'disabledfeatures');
              $settings->tool_mobile_custommenuitems = get_config('tool_mobile', 'custommenuitems');
 +            $settings->tool_mobile_apppolicy = get_config('tool_mobile', 'apppolicy');
          }
  
          return $settings;
@@@ -343,7 -342,8 +343,8 @@@
          $availablemods = core_plugin_manager::instance()->get_plugins_of_type('mod');
          $coursemodules = array();
          $appsupportedmodules = array('assign', 'book', 'chat', 'choice', 'data', 'feedback', 'folder', 'forum', 'glossary', 'imscp',
-                                         'label', 'lesson', 'lti', 'page', 'quiz', 'resource', 'scorm', 'survey', 'url', 'wiki');
+             'label', 'lesson', 'lti', 'page', 'quiz', 'resource', 'scorm', 'survey', 'url', 'wiki', 'workshop');
+ 
          foreach ($availablemods as $mod) {
              if (in_array($mod->name, $appsupportedmodules)) {
                  $coursemodules['$mmCourseDelegate_mmaMod' . ucfirst($mod->name)] = $mod->displayname;