Merge tizen_2.0 to master