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

* origin/develop: (34 commits)
  NSCREEN :merge nscreen
  Merge remote-tracking branch 'origin/nscreen' into develop
  Merge remote-tracking branch 'origin/develop' into nscreen
  NSCREEN : cssfile loader added cssfile loading added
  PROP : Fix color picker method. And fix "modifyStyle" API.
  UIB : fix west & noth direction resize
  NSCREEN : remove unused code. remove unused code.
  NSCREEN : Old nscreen source delete NScreenList, NScreenListItem class delete
  NSCREEN : NScreen view implement update NScreen view contents changed NScreen view action changed Nscreen icons added
  ANIMATOR : Refresh TimelinePage This is refreshing timeline when change page.
  UIB : rename Part.getPosition to Part.getPositionProperty
  UIB : add resize command
  ANIMATOR : Add messages using the timeline This is message using the timeline.
  NSCREEN : Modify meta reader&writer. Modify meta reader and writer for Nscreen view menu info.
  ANIMATOR : Implements cut, copy, paste Implements Animation cut, copy, paste
  NSCREEN: Make nscreenModelManager. Make nscreenModelManger.
  ANIMATOR : Fixed animator initialization This is fixing animator initialization.
  ANIMATOR : Check AnimationGroup Name This is checking animationgroup name duplication.
  NSCREEN : add getNscreeNModelList(device info) get NscreenModellist.
  NSCREEN : Update device Info and modify NscreenModel Update real device and Modify Nscreenmodel.
  ...

Conflicts:
	package/changelog

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

diff --cc package/changelog
index 99ef5f3,f650de9..1f36d9f
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,7 -1,4 +1,10 @@@
- * 0.1.425
++* 0.1.427
++- [Title] update version
++== yonghwan.jeon <yonghwan82.jeon@samsung.com> 2014-05-13 01:24
 +* 0.1.426
 +- [Title] update version
 +== Jaeyeol.lee <jaeyeol148.lee@samsung.com> 2014-05-12 17:30
+ * 0.1.425 
  - [Title] update version
  == Heekyoung Oh <heekyoung.oh@samsung.com> 2014-04-24 17:30
  * 0.1.424

diff --cc package/pkginfo.manifest
index 872483c,2dc6860..7c1bd4f
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,5 -1,5 +1,5 @@@
  Package : web-ui-builder-eplugin
- Version :0.1.426
 -Version :0.1.425
++Version :0.1.427
  OS : ubuntu-32
  Build-host-os : ubuntu-32
  Maintainer : Hoon Kang <h245.kang@samsung.com>
@@@ -11,7 -11,7 +11,7 @@@ Source : web-ui-builder-eplugi
  Description : 
  
  Package : web-ui-builder-eplugin
- Version :0.1.426
 -Version :0.1.425
++Version :0.1.427
  OS : ubuntu-64
  Build-host-os : ubuntu-64
  Maintainer : Hoon Kang <h245.kang@samsung.com>
@@@ -23,7 -23,7 +23,7 @@@ Source : web-ui-builder-eplugi
  Description : 
  
  Package : web-ui-builder-eplugin
- Version :0.1.426
 -Version :0.1.425
++Version :0.1.427
  OS : windows-32
  Build-host-os : ubuntu-32
  Maintainer : Hoon Kang <h245.kang@samsung.com>
@@@ -35,7 -35,7 +35,7 @@@ Source : web-ui-builder-eplugi
  Description :
  
  Package : web-ui-builder-eplugin
- Version :0.1.426
 -Version :0.1.425
++Version :0.1.427
  OS : windows-64
  Build-host-os : ubuntu-64
  Maintainer : Hoon Kang <h245.kang@samsung.com>
@@@ -47,7 -47,7 +47,7 @@@ Source : web-ui-builder-eplugi
  Description :
  
  Package : web-ui-builder-eplugin
- Version :0.1.426
 -Version :0.1.425
++Version :0.1.427
  OS : macos-64
  Build-host-os : ubuntu-64
  Maintainer : Hoon Kang <h245.kang@samsung.com>