Merge branch 'tizen_2.0'