Merge branch 'develop' into features/new_ui
authorjihye424.kim <jihye424.kim@samsung.com>
Thu, 20 Aug 2015 03:22:51 +0000 (12:22 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Thu, 20 Aug 2015 03:25:41 +0000 (12:25 +0900)
Change-Id: Icf5b77c3c6a0a932161464d9db5ed7a866df3ec3
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

Trivial merge