Merge branch 'tizen' into devel/tizen_3.0