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

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java

@@ -51,7 +51,7 @@ import java.util.List;
 public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminService {
 
     private static final Log log = LogFactory.getLog(DeviceManagementAdminServiceImpl.class);
-    private static final String DATE_FORMAT = "MM-dd-yyyy hh:mm a";
+    private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ssXXX";
 
     @POST
     @Path("/lock-devices")

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json

@@ -1,5 +1,5 @@
 {
-    "appName": "Enterprise Mobility Manager",
+    "appName": "WSO2 Enterprise Mobility Manager",
     "cachingEnabled": true,
     "debuggingEnabled": false,
     "permissionRoot": "/",