Merge branch 'mobile_master' into tizen_2.3b