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

* origin/tizen:
  UIB : Prevent the default editor for html files. prevent the default editor for html files.
  UIB : modify feature.xml Becaue Pakcage build fail, I modify feature.xml
  Merge remote-tracking branch 'origin/develop' into tizen
  UIB : Update version update version.
  UIB : fixed bug "Page Designer for index.html" unset default editor.
  UIB : Update version
  UIB : Merge develop

Conflicts:
	org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
	org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/HTMLBlockPropertyModifier.java

Change-Id: I39b2125e6f3662d4dac49c3c5f7a865ce3ce7242
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
index c283968,9875442..2bb4165
--- 1/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
--- 2/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
@@@ -535,11 -485,11 +535,12 @@@ public class DataBindingPage extends Pa
              
              TreeItem parentItem = selectedItems[0];
              if (parentItem != null) { 
 -              TreeItemData treeItemData = (TreeItemData) parentItem.getData("TREEITEMDATA");
 -                if (treeItemData != null) {
 -                    if (treeItemData.getObjectType() == null) {
 -                      treeItemData.setObjectType("JSONObject");
 -                      parentItem.setData("TREEITEMDATA", treeItemData);
 +              TreeItemData treeParentItemData = (TreeItemData) parentItem.getData("TREEITEMDATA");
 +                if (treeParentItemData != null) {
 +                    if (treeParentItemData.getObjectType() == null) {
 +                      treeParentItemData.setObjectType("JSONObject");
 +                      parentItem.setData("TREEITEMDATA", treeParentItemData);
++
                      } else {
                        //do nothing
                      }
@@@ -551,9 -501,6 +552,10 @@@
                  }
              }
              
 +//            TreeItemData treeItemData = new TreeItemData();
 +//            item.setData("TREEITEMDATA", treeItemData);
 +            
++
              item.setText("viewModelItem"+ idIndex);
              viewModelTree.showItem(item);
              return item;