Merge remote-tracking branch 'iotcon/tizen'