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

* origin/develop:
  PROP : Refactoring CssSelectorCategory.
  DATABIND : Change the remove UX remove the X button add the del key input
  SNIPPET : Refactoring id policy
  PROP : Fix dispose exception on CssStyleTab.
  NSCREEN : Remove possible Error. Add defense code for possible error by static analyzer
  PROP : Fix exception on CssSelectorCategory.
  UIB : code refactoring for PREVENT

Conflicts:
	org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java

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

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
Simple merge

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java
index b888509,ee22e86..cf16f72
--- 1/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java
--- 2/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java
@@@ -1453,11 -1454,23 +1454,22 @@@ public class SetSourceDialog extends Di
          }
      }
  
-     private static JSONObject readJsonFromFile(String file) throws IOException {
-         BufferedReader rd = new BufferedReader(new FileReader(file));
-         String jsonText = readAll(rd);
-         JSONObject json = (JSONObject) JSONValue.parse(jsonText);
-         return json;
+     private static JSONObject readJsonFromFile(String file) {
+         BufferedReader rd;
+               try {
+                       rd = new BufferedReader(new FileReader(file));
+                       String jsonText;
+                       try {
+                               jsonText = readAll(rd);
+                               JSONObject json = (JSONObject) JSONValue.parse(jsonText);
+                       return json;
+                       } catch (IOException e) {
+                               return null;
+                       }
+               
+               } catch (FileNotFoundException e) {
+                       return null;
+               }
 -        
      }
  
      private void makeTreeItemsFromJson(JSONObject json, String str, TreeItem parentTreeItem,