diff --git a/documentation/changelog.html b/documentation/changelog.html
index d68108060db..122b52327ec 100755
--- a/documentation/changelog.html
+++ b/documentation/changelog.html
@@ -48,7 +48,7 @@ <h1>Chamilo&nbsp;Changelog</h1>
 
     <a  name="1.10.2"></a>
 
-    <h1>Chamilo 1.10.2 - Alsted, 21st of December 2015</h1>
+    <h1>Chamilo 1.10.2 - Alsted, 22nd of December 2015</h1>
     <h3>Release notes - summary</h3>
     <p>Chamilo 1.10.2 is a minor, bugfix version of the 1.10.x branch, with a few new features and  bugfixes on top of 1.10.0. Notably, this version enables the migration from 1.9.x to 1.10.2 (many bugs were reported in the migration from 1.9.x to 1.10.0, which were fixed within the 2 months to this minor version).</p>
     <h3>Release name</h3>
diff --git a/main/document/showinframes.php b/main/document/showinframes.php
index dce3f188a8f..76d0f7d3990 100755
--- a/main/document/showinframes.php
+++ b/main/document/showinframes.php
@@ -104,7 +104,7 @@
 }
 
 $pathinfo = pathinfo($header_file);
-$jplayer_supported_files = array('mp4', 'ogv','flv');
+$jplayer_supported_files = array('mp4', 'ogv', 'flv', 'm4v');
 $jplayer_supported = false;
 
 if (in_array(strtolower($pathinfo['extension']), $jplayer_supported_files)) {
@@ -250,33 +250,40 @@ function init() {
 }
 
 $execute_iframe = true;
-
 if ($jplayer_supported) {
     $extension = api_strtolower($pathinfo['extension']);
+    if ($extension == 'mp4')  {
+        $extension = 'm4v';
+    }
     $js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
     $htmlHeadXtra[] = '<link rel="stylesheet" href="'.$js_path.'jquery-jplayer/skin/blue.monday/css/jplayer.blue.monday.css" type="text/css">';
     $htmlHeadXtra[] = '<script type="text/javascript" src="'.$js_path.'jquery-jplayer/jplayer/jquery.jplayer.min.js"></script>';
 
-    $jquery = ' $("#jquery_jplayer_1").jPlayer({
-                    ready: function() {
-                        $(this).jPlayer("setMedia", {
-                            '.$extension.' : "'.$document_data['direct_url'].'"
-                        });
-                    },
-                    errorAlerts: false,
-                    warningAlerts: false,
-                     swfPath: "'.$js_path.'jquery-jplayer/jplayer/",
-                    //supplied: "m4a, oga, mp3, ogg, wav",
-                    supplied: "'.$extension.'",
-                    //wmode: "window",
-                    solution: "flash, html",  // Do not change this setting
-                    cssSelectorAncestor: "#jp_container_1",
-                });';
+    $jquery = '
+        $("#jquery_jplayer_1").jPlayer({
+            ready: function() {
+                $(this).jPlayer("setMedia", {
+                    '.$extension.' : "'.$document_data['direct_url'].'"
+                });
+            },
+            cssSelectorAncestor: "#jp_container_1",
+            swfPath: "'.$js_path.'jquery-jplayer/jplayer/",
+            supplied: "'.$extension.'",
+            useStateClassSkin: true,
+            autoBlur: false,
+            keyEnabled: false,
+            remainingDuration: true,
+            toggleDuration: true,
+            solution: "html, flash",
+            errorAlerts: false,
+            warningAlerts: false
+        });
+    ';
 
     $htmlHeadXtra[] = '<script>
         $(document).ready( function() {
             //Experimental changes to preview mp3, ogg files
-            '.$jquery.'
+        '.$jquery.'
         });
     </script>';
     $execute_iframe = false;
@@ -356,9 +363,13 @@ function init() {
 echo '</div>';
 
 if ($jplayer_supported) {
-    echo '<br /><div class="span12" style="margin:0 auto; width:100%; text-align:center;">';
+    echo '<br />';
+    echo '<div class="col-md-3 col-md-offset-3">';
     echo DocumentManager::generate_video_preview($document_data);
     echo '</div>';
+
+    // media_element blocks jplayer disable it
+    Display::$global_template->assign('show_media_element', 0);
 }
 
 if ($is_freemind_available) {
@@ -442,7 +453,7 @@ function getMap(map){
         $content = Security::remove_XSS(file_get_contents($file_url_sys));
         echo $content;
     } else {
-            echo '<iframe id="mainFrame" name="mainFrame" border="0" frameborder="0" scrolling="no" style="width:100%;" height="600" src="'.$file_url_web.'&rand='.mt_rand(1, 10000).'" height="500" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe>';
+        echo '<iframe id="mainFrame" name="mainFrame" border="0" frameborder="0" scrolling="no" style="width:100%;" height="600" src="'.$file_url_web.'&rand='.mt_rand(1, 10000).'" height="500" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe>';
     }
 }
 Display::display_footer();
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index 7c87088dd9f..077449524cb 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -20,7 +20,7 @@
  */
 class Display
 {
-    /* The main template*/
+    /** @var Template */
     public static $global_template;
     public static $preview_style = null;
 
@@ -756,12 +756,12 @@ public static function return_icon(
         }
 
         $icon = api_get_cdn_path($icon);
-        
+
         if ($return_only_path) {
             return $icon;
-            
+
         }
-        
+
         $img = self::img($icon, $alt_text, $additional_attributes);
         if (SHOW_TEXT_NEAR_ICONS == true and !empty($alt_text)) {
             if ($show_text) {
diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php
index 763616cd4d8..887daf81b14 100755
--- a/main/inc/lib/document.lib.php
+++ b/main/inc/lib/document.lib.php
@@ -3199,15 +3199,15 @@ static function generate_media_preview($i, $type = 'simple')
      * @param array $document_data
      * @return string
      */
-    static function generate_video_preview($document_data = array())
+    public static function generate_video_preview($document_data = array())
     {
+        //<button class="jp-video-play-icon" role="button" tabindex="0">play</button>
         $html = '
-        <div id="jp_container_1" class="jp-video">
+        <div id="jp_container_1" class="jp-video" role="application" aria-label="media player">
             <div class="jp-type-single">
                 <div id="jquery_jplayer_1" class="jp-jplayer"></div>
                 <div class="jp-gui">
                     <div class="jp-video-play">
-                        <a href="javascript:;" class="jp-video-play-icon" tabindex="1">play</a>
                     </div>
                     <div class="jp-interface">
                         <div class="jp-progress">
@@ -3215,30 +3215,27 @@ static function generate_video_preview($document_data = array())
                                 <div class="jp-play-bar"></div>
                             </div>
                         </div>
-                        <div class="jp-current-time"></div>
+                        <div class="jp-current-time" role="timer" aria-label="time">&nbsp;</div>
+                        <div class="jp-duration" role="timer" aria-label="duration">&nbsp;</div>
                         <div class="jp-controls-holder">
-                            <ul class="jp-controls">
-                                <li><a href="javascript:;" class="jp-play" tabindex="1">play</a></li>
-                                <li><a href="javascript:;" class="jp-pause" tabindex="1">pause</a></li>
-                                <li><a href="javascript:;" class="jp-stop" tabindex="1">stop</a></li>
-                                <li><a href="javascript:;" class="jp-mute" tabindex="1" title="mute">mute</a></li>
-                                <li><a href="javascript:;" class="jp-unmute" tabindex="1" title="unmute">unmute</a></li>
-                                <li><a href="javascript:;" class="jp-volume-max" tabindex="1" title="max volume">max volume</a></li>
-                            </ul>
+                          <div class="jp-controls">
+                            <button class="jp-play" role="button" tabindex="0">play</button>
+                            <button class="jp-stop" role="button" tabindex="0">stop</button>
+                          </div>
+                          <div class="jp-volume-controls">
+                            <button class="jp-mute" role="button" tabindex="0">mute</button>
+                            <button class="jp-volume-max" role="button" tabindex="0">max volume</button>
                             <div class="jp-volume-bar">
                                 <div class="jp-volume-bar-value"></div>
                             </div>
-                            <ul class="jp-toggles">
-                                <li><a href="javascript:;" class="jp-full-screen" tabindex="1" title="full screen">full screen</a></li>
-                                <li><a href="javascript:;" class="jp-restore-screen" tabindex="1" title="restore screen">restore screen</a></li>
-                                <li><a href="javascript:;" class="jp-repeat" tabindex="1" title="repeat">repeat</a></li>
-                                <li><a href="javascript:;" class="jp-repeat-off" tabindex="1" title="repeat off">repeat off</a></li>
-                            </ul>
+                          </div>
+                          <div class="jp-toggles">
+                            <button class="jp-repeat" role="button" tabindex="0">repeat</button>
+                            <button class="jp-full-screen" role="button" tabindex="0">full screen</button>
+                          </div>
                         </div>
-                        <div class="jp-title">
-                            <ul>
-                                <li>' . $document_data['title'] . '</li>
-                            </ul>
+                        <div class="jp-details">
+                          <div class="jp-title" aria-label="title">&nbsp;</div>
                         </div>
                     </div>
                 </div>
diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index a667ddeca90..492ab110980 100755
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -1104,7 +1104,7 @@ public function delete($courseInfo = null, $id = null, $delete = 'keep')
      */
     public function delete_children_items($id)
     {
-        $course_id = api_get_course_int_id();
+        $course_id = $this->course_info['real_id'];
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::delete_children_items(' . $id . ')', 0);
         }
@@ -4534,7 +4534,7 @@ public function set_name($name = null)
         $this->name = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
-        $course_id = api_get_course_int_id();
+        $course_id = $this->course_info['real_id'];
         $sql = "UPDATE $lp_table SET
                 name = '" . Database::escape_string($this->name). "'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
@@ -5983,18 +5983,39 @@ public function create_document($courseInfo, $content = '', $title = '', $extens
             $tmp_filename = $filename . '_' . ++ $i;
 
         $filename = $tmp_filename . '.'.$extension;
-        $content = stripslashes($content);
-
-        $content = str_replace(api_get_path(WEB_COURSE_PATH), api_get_path(REL_PATH).'courses/', $content);
+        if ($extension == 'html') {
+            $content = stripslashes($content);
+            $content = str_replace(
+                api_get_path(WEB_COURSE_PATH),
+                api_get_path(REL_PATH).'courses/',
+                $content
+            );
 
-        // Change the path of mp3 to absolute.
+            // Change the path of mp3 to absolute.
 
-        // The first regexp deals with :// urls.
-        $content = preg_replace("|(flashvars=\"file=)([^:/]+)/|", "$1" . api_get_path(REL_COURSE_PATH) . $courseInfo['path'] . '/document/', $content);
-        // The second regexp deals with audio/ urls.
-        $content = preg_replace("|(flashvars=\"file=)([^/]+)/|", "$1" . api_get_path(REL_COURSE_PATH) . $courseInfo['path'] . '/document/$2/', $content);
-        // For flv player: To prevent edition problem with firefox, we have to use a strange tip (don't blame me please).
-        $content = str_replace('</body>', '<style type="text/css">body{}</style></body>', $content);
+            // The first regexp deals with :// urls.
+            $content = preg_replace(
+                "|(flashvars=\"file=)([^:/]+)/|",
+                "$1".api_get_path(
+                    REL_COURSE_PATH
+                ).$courseInfo['path'].'/document/',
+                $content
+            );
+            // The second regexp deals with audio/ urls.
+            $content = preg_replace(
+                "|(flashvars=\"file=)([^/]+)/|",
+                "$1".api_get_path(
+                    REL_COURSE_PATH
+                ).$courseInfo['path'].'/document/$2/',
+                $content
+            );
+            // For flv player: To prevent edition problem with firefox, we have to use a strange tip (don't blame me please).
+            $content = str_replace(
+                '</body>',
+                '<style type="text/css">body{}</style></body>',
+                $content
+            );
+        }
 
         if (!file_exists($filepath . $filename)) {
             if ($fp = @ fopen($filepath . $filename, 'w')) {
diff --git a/main/newscorm/scorm.class.php b/main/newscorm/scorm.class.php
index ff218b1a788..04ac514de03 100755
--- a/main/newscorm/scorm.class.php
+++ b/main/newscorm/scorm.class.php
@@ -41,9 +41,8 @@ public function __construct($course_code = null, $resource_id = null, $user_id =
         if ($this->debug > 0) {
             error_log('New LP - scorm::scorm('.$course_code.','.$resource_id.','.$user_id.') - In scorm constructor', 0);
         }
-        if (!empty($course_code) && !empty($resource_id) && !empty($user_id)) {
-            parent::__construct($course_code, $resource_id, $user_id);
-        }
+
+        parent::__construct($course_code, $resource_id, $user_id);
     }
 
     /**
diff --git a/main/webservices/client_soap.php b/main/webservices/client_soap.php
index 044710840db..3e99361d72f 100755
--- a/main/webservices/client_soap.php
+++ b/main/webservices/client_soap.php
@@ -69,7 +69,7 @@
     // third party user id
     'original_user_id_value'    => $random_user_id,
     'secret_key'                => $secret_key,
-    //Extra fields
+    // Extra fields
     'extra' => array(
         array('field_name' => 'ruc', 'field_value' => '123'),
         array('field_name' => 'DNI', 'field_value' => '4200000')
diff --git a/main/webservices/lp.php b/main/webservices/lp.php
index ef227de227e..8e798fc3cce 100644
--- a/main/webservices/lp.php
+++ b/main/webservices/lp.php
@@ -110,6 +110,7 @@ function WSHelperVerifyKey($params)
         ),
         'file_data' => array('name' => 'file', 'type' => 'xsd:string'),
         'filename' => array('name' => 'filename', 'type' => 'xsd:string'),
+        'lp_name' => array('name' => 'lp_name', 'type' => 'xsd:string'),
         'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string'),
     )
 );
@@ -142,6 +143,8 @@ function WSImportLP($params)
     $sessionIdName = isset($params['session_id_name']) ? $params['session_id_name'] : null;
     $sessionIdValue = isset($params['session_id_value']) ? $params['session_id_value'] : null;
 
+    $lpName = $params['lp_name'];
+
     $courseCode = CourseManager::get_course_id_from_original_id(
         $courseIdValue,
         $courseIdName
@@ -173,7 +176,7 @@ function WSImportLP($params)
     $maker = 'Scorm';
     $maxScore = ''; //$_REQUEST['use_max_score']
 
-    $oScorm = new scorm();
+    $oScorm = new scorm($courseCode);
     $fileData = base64_decode($params['file_data']);
 
     $uniqueFile = uniqid();
@@ -184,7 +187,7 @@ function WSImportLP($params)
 
     $fileInfo = array(
         'tmp_name' => $filePath,
-        'name' => $fileName
+        'name' => $fileName,
     );
 
     $manifest = $oScorm->import_package($fileInfo, '', $courseInfo);
@@ -203,7 +206,7 @@ function WSImportLP($params)
             $maxScore,
             $sessionId
         );
-
+        $oScorm->set_name($lpName);
         $oScorm->set_proximity($proximity, $courseId);
         $oScorm->set_maker($maker, $courseId);
         //$oScorm->set_jslib('scorm_api.php');
@@ -329,7 +332,7 @@ function WSGetLpList($params)
     foreach ($flatList as $id => $lp) {
         $result[] = array(
             'id' => $id,
-            'name' => $lp['lp_name']
+            'name' => $lp['lp_name'],
         );
     }
 
@@ -399,14 +402,16 @@ function WSDeleteLp($params)
     );
 
     $courseInfo = api_get_course_info($courseCode);
-    //$courseId = $courseInfo['real_id'];
+    $courseId = $courseInfo['real_id'];
 
     if (empty($courseInfo)) {
         if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
         return 'Course not found';
     }
 
-    /*$sessionId = 0;
+    $sessionId = 0;
+
+    /*
     if (!empty($sessionIdName) && !empty($sessionIdValue)) {
         $sessionId = SessionManager::get_session_id_from_original_id(
             $sessionIdValue,
@@ -424,7 +429,54 @@ function WSDeleteLp($params)
     $lp = new learnpath($courseInfo['code'], $lpId, null);
     if ($lp) {
         if ($debug) error_log("LP deleted $lpId");
+
+        $course_dir = $courseInfo['directory'] . '/document';
+        $sys_course_path = api_get_path(SYS_COURSE_PATH);
+        $base_work_dir = $sys_course_path . $course_dir;
+
+        $items = $lp->get_flat_ordered_items_list($lpId, 0, $courseId);
+
+        if (!empty($items)) {
+            /** @var $item learnpathItem */
+            foreach ($items as $itemId) {
+                $item = new learnpathItem($itemId, null, $courseId);
+
+                if ($item) {
+                    $documentId = $item->get_path();
+
+                    if ($debug) error_log("lp item id found #$itemId");
+
+                    $documentInfo = DocumentManager::get_document_data_by_id(
+                        $documentId,
+                        $courseInfo['code'],
+                        false,
+                        $sessionId
+                    );
+
+                    if (!empty($documentInfo)) {
+                        if ($debug) {
+                            error_log("Document id deleted #$documentId");
+                        }
+                        DocumentManager::delete_document(
+                            $courseInfo,
+                            null,
+                            $base_work_dir,
+                            $sessionId,
+                            $documentId
+                        );
+                    } else {
+                        if ($debug) {
+                            error_log("No document found for id #$documentId");
+                        }
+                    }
+                } else {
+                    if ($debug) error_log("Document not found #$itemId");
+                }
+            }
+        }
+
         $lp->delete($courseInfo, $lpId, 'remove');
+
         return 1;
     }
 
@@ -453,7 +505,7 @@ function WSDeleteLp($params)
     'SOAP-ENC:Array',
     array(),
     array(array('ref' => 'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:lpItem[]')),
-    'tns:lpItemList'
+    'tns:lpItem'
 );
 
 $server->wsdl->addComplexType(
diff --git a/main/webservices/registration.soap.php b/main/webservices/registration.soap.php
index 1b67e4fafb8..8c82592d179 100755
--- a/main/webservices/registration.soap.php
+++ b/main/webservices/registration.soap.php
@@ -1141,7 +1141,7 @@ function WSCreateUserPasswordCrypted($params)
     $loginName = $params['loginname'];
     $official_code = isset($params['official_code']) ? $params['official_code'] : '';
     $language = '';
-    $phone = $params['phone'];
+    $phone = isset($params['phone']) ? $params['phone'] : '';
     $picture_uri = '';
     $auth_source = PLATFORM_AUTH_SOURCE;
     $expiration_date = '';
@@ -2680,22 +2680,25 @@ function WSCreateCourse($params)
 
     foreach ($courses_params as $course_param) {
         $title = $course_param['title'];
-        $category_code = $course_param['category_code'];
+        $category_code = isset($course_param['category_code']) ? $course_param['category_code'] : '';
         $wanted_code = $course_param['wanted_code'];
-        $tutor_name = $course_param['tutor_name'];
+        $tutor_name = isset($course_param['tutor_name']) ? $course_param['tutor_name'] : '';
         $course_language = 'english'; // TODO: A hard-coded value.
         $original_course_id_name = $course_param['original_course_id_name'];
         $original_course_id_value = $course_param['original_course_id_value'];
         $orig_course_id_value[] = $course_param['original_course_id_value'];
         $visibility = null;
 
-        if ($course_param['visibility'] &&
-            $course_param['visibility'] >= 0 &&
-            $course_param['visibility'] <= 3
-        ) {
-            $visibility = $course_param['visibility'];
+        if (isset($course_param['visibility'])) {
+            if ($course_param['visibility'] &&
+                $course_param['visibility'] >= 0 &&
+                $course_param['visibility'] <= 3
+            ) {
+                $visibility = $course_param['visibility'];
+            }
         }
-        $extra_list = $course_param['extra'];
+        $extra_list = isset($course_param['extra']) ? $course_param['extra'] : '';
+
 
         // Check whether exits $x_course_code into user_field_values table.
         $courseInfo = CourseManager::getCourseInfoFromOriginalId(
@@ -2747,12 +2750,21 @@ function WSCreateCourse($params)
             $values['course_language'] = api_get_setting('platformLanguage');
         }
 
-        $values['tutor_name'] = api_get_person_name($_user['firstName'], $_user['lastName'], null, null, $values['course_language']);
+        if (isset($_user['firstName'])) {
+            $values['tutor_name'] = api_get_person_name(
+                $_user['firstName'],
+                $_user['lastName'],
+                null,
+                null,
+                $values['course_language']
+            );
+        }
 
         $params = array();
         $params['title'] = $title;
         $params['wanted_code'] = $wanted_code;
         $params['category_code'] = $category_code;
+        $params['course_category']    = $category_code;
         $params['tutor_name'] = $tutor_name;
         $params['course_language'] = $course_language;
         $params['user_id'] = api_get_user_id();
@@ -6717,6 +6729,82 @@ function WSDeleteUserFromGroup($params)
     );
 }
 
+
+$server->wsdl->addComplexType(
+    'unSubscribeUserFromCourseSimple',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'original_user_id_value' => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'original_user_id_name' => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_course_id_value' => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'original_course_id_name' => array('name' => 'original_course_id_name', 'type' => 'xsd:string'),
+        'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string')
+    )
+);
+
+
+
+/**
+ * @param array $params
+ * @return array|null|soap_fault
+ */
+function WSUnSubscribeUserFromCourseSimple($params)
+{
+    global $debug;
+    error_log('WSUnSubscribeUserFromCourseSimple');
+    if (!WSHelperVerifyKey($params)) {
+        return return_error(WS_ERROR_SECRET_KEY);
+    }
+
+    $original_user_id_value = $params['original_user_id_value'];
+    $original_user_id_name = $params['original_user_id_name'];
+    $original_course_id_value = $params['original_course_id_value'];
+    $original_course_id_name = $params['original_course_id_name'];
+
+    $result = array();
+    $result['original_user_id_value'] = $original_user_id_value;
+    $result['result'] = 0;
+
+    $user_id = UserManager::get_user_id_from_original_id(
+        $original_user_id_value,
+        $original_user_id_name
+    );
+
+    if ($user_id) {
+        if ($debug) {
+            error_log(
+                "User $original_user_id_value, $original_user_id_name found"
+            );
+        }
+        $courseCode = CourseManager::get_course_id_from_original_id(
+            $original_course_id_value,
+            $original_course_id_name
+        );
+
+        if (empty($courseCode)) {
+            // Course was not found
+            if ($debug) {
+                error_log("course not found");
+            }
+        } else {
+            if ($debug) {
+                error_log("Course $courseCode found");
+            }
+            CourseManager::unsubscribe_user($user_id, $courseCode, 0);
+            $result['result'] = 1;
+        }
+    } else {
+        if ($debug) {
+            error_log("User not found");
+        }
+    }
+}
+
+
+
 /* Delete user from group Web Service end */
 
 // Add more webservices through hooks from plugins