Merge branch 'develop' into features/new_ui

Conflicts:
	src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java

Change-Id: I3924dddfb46e1a4b69b64afa5ec9c4709f195a07
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --cc package/changelog
Simple merge

diff --cc package/pkginfo.manifest
Simple merge

diff --cc resource/strings/uimessages.properties
Simple merge

diff --cc src/org/tizen/emulator/manager/EmulatorManager.java
index c180e4a,9580503..161297f
--- 1/src/org/tizen/emulator/manager/EmulatorManager.java
--- 2/src/org/tizen/emulator/manager/EmulatorManager.java
+++ b/src/org/tizen/emulator/manager/EmulatorManager.java
@@@ -49,10 -49,11 +49,11 @@@ import org.tizen.emulator.manager.job.O
  import org.tizen.emulator.manager.logging.EMLogger;
  import org.tizen.emulator.manager.resources.FilePathResources;
  import org.tizen.emulator.manager.resources.StringResources;
+ import org.tizen.emulator.manager.tool.About;
  import org.tizen.emulator.manager.tool.CocoaUtil;
  import org.tizen.emulator.manager.tool.SettingInfoFile;
 -import org.tizen.emulator.manager.ui.MainDialog;
  import org.tizen.emulator.manager.ui.dialog.MessageDialog;
 +import org.tizen.emulator.manager.ui.renewal.MainDialog;
  import org.tizen.emulator.manager.vms.helper.WorkerLock;
  
  import com.sun.jna.Native;

diff --cc src/org/tizen/emulator/manager/tool/About.java
Simple merge

diff --cc src/org/tizen/emulator/manager/tool/TapUtil.java
Simple merge

diff --cc src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java
index 7ac1907,b23561b..b9c3988
--- 1/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java
--- 2/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java
+++ b/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java
@@@ -58,15 -52,16 +58,17 @@@ import org.tizen.emulator.manager.ui.Me
  public class AboutDialog {
        private static Shell dialog = null;
        private static String textContents = ""; //$NON-NLS-1$
 -      private static int width  = 436; //149 + 287
 -      private static int height = 290; // 180 + 110
 +      private static int WIDTH  = 436; //149 + 287
 +      private static int HEIGHT = 290; // 180 + 110
        static {
-               About.initAboutContents();
-               textContents = Messages.getString("AboutDialog.2") + About.getInstance().getAboutVersion() //$NON-NLS-1$
+               textContents = StringResources.NEW_LINE
+                                + Messages.getString("AboutDialog.0") //$NON-NLS-1$
+                                + StringResources.NEW_LINE + StringResources.NEW_LINE
+                                + Messages.getString("AboutDialog.2") + About.getInstance().getAboutVersion() //$NON-NLS-1$
                                 + StringResources.NEW_LINE
 -                               + Messages.getString("AboutDialog.3") + About.getInstance().getBuildTime(); //$NON-NLS-1$
 -
 +                               + Messages.getString("AboutDialog.3") + About.getInstance().getBuildTime()
 +                               + StringResources.NEW_LINE
 +                               + "Package Version: " + About.getInstance().getPackageVersion(); //$NON-NLS-1$
        }
  
        public static void open() {

diff --cc src/org/tizen/emulator/manager/vms/VMLauncher.java
Simple merge