Merge remote-tracking branch 'tizendev/master' into tizen_2.1