Merge branch 'master' of F:\Android\Android Qsoft\MyAndroidTeam with conflicts.
Merge remote-tracking branch 'origin/master'
update