daily update
Merge branch 'master' of github.com:tianhuyang/Scoutin