Merge branch 'develop' into release

Conflicts:
	package/changelog
	package/pkginfo.manifest

diff --cc package/changelog
index 1de416a,bfd5796..e83486b
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,8 -1,23 +1,18 @@@
- *1.3.49
+ *1.3.53
+ - add tool tip for file sharing to the mac os
+ == 김지혜 <jihye1128.kim@samsung.com> 2012-11-06
+ 
+ *1.3.52
+ - make disable file sharing to the mac os.
+ - change checking running emulator in the modify function.(N_SE-13129)
+ - change running parameter when start emulator for the arm image.
+ == 김지혜 <jihye1128.kim@samsung.com> 2012-11-05
+ 
+ *1.3.51
  - 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