Merge branch 'develop' into release

Conflicts:
	VERSION
	package/changelog
	package/pkginfo.manifest

diff --cc VERSION
index 8d385ee,997bba2..2cabede
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 2.0.0a4-RC2
 -2.0.0a4
++2.0.0a4-RC3

diff --cc package/changelog
index 4155071,cd9547e..1de416a
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,3 -1,18 +1,13 @@@
 -*1.3.51
++*1.3.49
+ - modify select skin routine.
+ - add resolution : 320x480, 1280x800, 1920x1080, 2560x1600
 -== 김지혜 <jihye1128.kim@samsung.com> 2012-11-02
 -
 -*1.3.50
+ - Modify launch command for arm emulator.
+ - Skin-args and qemu-args were duplicated and other options were not suitable for arm emulator.
 -== Kitae Kim <kt920.kim@samsung.com> 2012-11-01
 -*1.3.49
+ - add 'select skin path' menu.
+ - modify console mode.
+ - add 'Skin' class
 -== 김지혜 <jihye1128.kim@samsung.com> 2012-10-31
++== 김지혜 <jihye1128.kim@samsung.com> 2012-11-02
+ 
  *1.3.48
  - change multi touch's max point 3->6
  - update version

diff --cc package/pkginfo.manifest
index 066240f,9d220c7..de25ae5
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,5 -1,5 +1,4 @@@
--Source: emulator-manager
- Version: 1.3.48
 -Version: 1.3.51
++Version: 1.3.49
  Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
  
  Package: emulator-manager