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

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>