Merge remote-tracking branch 'origin/mw' into tizen

Conflicts:
	org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorFrame.java

Change-Id: I8f82f1619315f1a0bf6af0cfa245e74ee9957db2
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/viewer/HoverBrowserViewer.java
Simple merge

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
index 76df952,0ead6a2..76c8a10
--- 1/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
--- 2/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
@@@ -675,11 -682,11 +682,15 @@@ public class PageDesigner extends Graph
          action = new CssSelecotrAction(this);
          actionRegistry.registerAction(action);
          getSelectionActions().add(action.getId());
 +        
 +        action = new ShowInspectorAction(designer.getBrowser().getBrowser());
 +        actionRegistry.registerAction(action);
 +        getSelectionActions().add(action.getId());
  
+         action = new ShowInspectorAction(designer.getBrowser().getBrowser());
+         actionRegistry.registerAction(action);
+         getSelectionActions().add(action.getId());
+ 
          action = new ExportTemplateAction(this);
          actionRegistry.registerAction(action);
          getSelectionActions().add(action.getId());
@@@ -1156,11 -1162,11 +1166,15 @@@
  
          if (appManager != null) {
              appManager.removePageListener(this);
+ 
+             if (appManager.getPageDataSet() != null) {
+                 appManager.getPageDataSet().removePageListener(this);
+             }
          }
 +        
 +        if (appManager.getPageDataSet() != null) {
 +              appManager.getPageDataSet().removePageListener(this);
 +        }
  
          // designer.setCssFile(null);
          if (pageData != null) {