Merge branch 'tizen' into tizen_3.0