[Mobile] Merge

Merged with master and resolved conflicts.

platform/commonUI/general/res/templates/tree-node.html

@@ -21,8 +21,7 @@
 -->
 <span ng-controller="ToggleController as toggle">
     <span ng-controller="TreeNodeController as treeNode">
-        <span
-	        class="tree-item menus-to-left"
+        <span class="tree-item menus-to-left"
 	        ng-class="{selected: treeNode.isSelected()}"
 	        >
             <mct-representation                                
@@ -44,10 +43,10 @@
             </span>
         </span>
         <span
-			class="tree-item-subtree"
-			ng-show="toggle.isActive()"
-			ng-if="model.composition !== undefined"
-			>
+            class="tree-item-subtree"
+            ng-show="toggle.isActive()"
+            ng-if="model.composition !== undefined"
+            >
 
             <mct-representation key="'subtree'"
                                 ng-model="ngModel"