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

* origin/develop: (25 commits)
  NSCREEN : change group selection color, etc. 1. change group selection color and bg color 2. show enabled item count on group title. 3. view minimum size set.
  NSREEN: add null check in nscreenModelManager. getNscreenModelForDevice() searched NscreenModels. return value check null.
  MODEL : Update image widget descriptor.
  MODEL : Fix image widget for size adjustment.
  NSCREEN : fix resolution fit resolution : fit fixed
  ANIMATOR : Implements merge/split keyframe Implements merge/split keyframe when keyframe is edited by user from timeline view including undo/redo
  NSCREEN : Viewport setting added 1. viewport mode added 2. folding fixed
  NSCREEN : remove pixel ratio in Screen feature. Remove pixel ratio in screen feature.
  UIB : add viewport width param
  ANIMATOR : Refresh globalActionbar This is refreshing globarActionBar when operated other actions.
  NSCREEN : Modify NscreenDescriptor. Modify Nscreen Data and  Remove unused data.
  DATABIND: Displays the binding info in the view model panel
  NSCREEN : nscreen group folding enabled nscreen group folding feature added
  NSCREEN : Enable/Disable bug fixed, etc. 1. NScreen Item enable/disable bug fix (css selection bug) 2. NScreen group name added 3. NScreen Title added 4. ground.js indentation fixed 5. data-binding dialog dependency fixed (webapp-eplugin package changed)
  ANIMATOR : Modify Filter The timelineview is refreshed if click filter button or other action.
  PAGETEMP: Add CreatePageCommand and apply on Page template CreatePageCommand is applied when we add a new page on Pages view. Then Undo and Redo is possible.
  PROP : Add display style.
  ANIMATOR : remove NPE
  DATABIND: modify the rename rule in the data source panel
  PROP: Bug fix the custom event in the action tab
  ...

Conflicts:
	package/changelog

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

diff --cc org.tizen.webuibuilder/META-INF/MANIFEST.MF
Simple merge

diff --cc package/changelog
index aad68db,e277439..f7b9901
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,7 -1,4 +1,7 @@@
- * 0.1.427
 +* 0.1.428
 +- [Title] changed configuration package name
 +== changhyun1.lee <changhyun1.lee@samsung.com> 2014-05-14
+ * 0.1.427 
  - [Title] update version
  == yonghwan.jeon <yonghwan82.jeon@samsung.com> 2014-05-13 01:24
  * 0.1.426