Merge branch 'tizen' into tizen_studio_2.0_p4.0