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

Conflicts:
	package/changelog

diff --cc package/changelog
index ae3e78c,695d5e6..1850f96
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,6 -1,6 +1,9 @@@
 -* 2.1.49
++* 2.1.50
+ - Fixed Timeout problem 
+ == donghee yang <donghee.yang@samsung.com> 2013-10-08
 +* 2.1.49
 +- Fixed bug about undisplayed project list in Projects page.
 +== Sungmin kim <dev.sungmin.kim@samsung.com> 2013-10-08
  * 2.1.48
  - Fixed sdk-image name (TIZNE -> TIZEN)
  == jonghwan park <jonghwan2.park@samsung.com> 2013-09-12