Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java

@@ -766,6 +766,22 @@ public class TryIt {
             default:
                 qemuSystemFileLocation += osSuffix + "-x86_64" + File.separator + "qemu-system-i386";
         }
+        setExecutePermission(qemuSystemFileLocation);
+
+        qemuSystemFileLocation = androidSdkHome + File.separator + "emulator" + File.separator
+                + "qemu" + File.separator;
+
+        switch (osSuffix) {
+            case Constants.MAC_OS:
+                qemuSystemFileLocation += Constants.MAC_DARWIN + "-x86_64" + File.separator + "qemu-system-i386";
+                break;
+            case Constants.WINDOWS_OS:
+                qemuSystemFileLocation += osSuffix + "-x86_64" + File.separator + "qemu-system-i386.exe";
+                break;
+            default:
+                qemuSystemFileLocation += osSuffix + "-x86_64" + File.separator + "qemu-system-i386";
+        }
+
         killServer();
         setExecutePermission(qemuSystemFileLocation);
         ExecutorService service = Executors.newSingleThreadExecutor();
@@ -814,12 +830,14 @@ public class TryIt {
      * @param fileName name of the file to set execution permission.
      */
     private void setExecutePermission(String fileName) {
-        if (!new File(fileName).canExecute()) {
-            if (!new File(fileName).setExecutable(true)) {
-                System.out.println("Unable to set the execute permission of : " + fileName);
-                System.out.println("Please set the executable permission for file "
-                        + new File(fileName).getAbsolutePath() + " to continue");
-                System.exit(1);      // if can't execute, unable to proceed
+        if (new File((fileName)).exists()) {
+            if (!new File(fileName).canExecute()) {
+                if (!new File(fileName).setExecutable(true)) {
+                    System.out.println("Unable to set the execute permission of : " + fileName);
+                    System.out.println("Please set the executable permission for file "
+                            + new File(fileName).getAbsolutePath() + " to continue");
+                    System.exit(1);      // if can't execute, unable to proceed
+                }
             }
         }
     }

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/theme.hbs

@@ -23,7 +23,7 @@
     <!-- Font Awesome CSS -->
     {{~css "lib/font-awesome_4.3.0/css/font-awesome.min.css" combine=false}}
     <!-- Font WSO2 CSS -->
-    {{~css "lib/font-wso2_1.2/css/font-wso2.css" combine=false}}
+    {{~css "lib/font-wso2-1.3.0/css/font-wso2.css" combine=false}}
     <!-- Theme LESS -->
     {{~css "less/theme.less" combine=false}}
     {{~css "css/theme-wso2.css" combine=false}}

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/theme.hbs

@@ -23,7 +23,7 @@
     <!-- Font Awesome CSS -->
     {{~css "lib/font-awesome_4.3.0/css/font-awesome.min.css" combine=false}}
     <!-- Font WSO2 CSS -->
-    {{~css "lib/font-wso2_1.2/css/font-wso2.css" combine=false}}
+    {{~css "lib/font-wso2-1.3.0/css/font-wso2.css" combine=false}}
     <!-- Theme LESS -->
     {{~css "less/theme.less" combine=false}}
     {{~css "css/theme-wso2.css" combine=false}}