Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
NSCREEN: FIXED device info.
DESIGNER : fix scrollbar range
NSCREEN : Remove width&height in Device and Modify Nscreen Model. Remove width & Height in Device and Modify Nscreen Model.
NSCREEN : initial style apply bug fixed start time css style applied
NSCREEN : fixed bug(Recovery nscreenModel). When soucre mode edited, NscreenModel is not pefect recvering. It is fiexed.
DATABIND : add text binding for the submit button widget a. update the submit button descriptor b. add text binding
NSCREEN : start up view port bug fix view port size problem fixed
DESIGNER : add undo shortcut
Merge remote-tracking branch 'origin/tizen' into develop
PROP : Fix setValue of SizeMethod.
UIB : fix width/height func on JS
ANIMATOR : Refresh ContextMenu ContextMenu is refreshed when clicked filter.
ANIMATOR : Bug fix for merge/split keyframe If Predefined animation Keyframe put one upon another keyframe, That keyframe is not merge/split, Only customKeyframe will be merged or splited or keyframes are not put on upon another keyframe and have different properties
NSCREEN : default device changed profile default device added common feature history added
PROP : Fix display size text when value modified.
PROP : Add modify function in Transform. And add increment to SizeMethod.
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java
Change-Id: Ief54ac30f1d039110fb3dab0e5fbbae71da7f535
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>