Merge pull request #49 from cdxahz/master

标注text/scanner完成，申请log包
log
Merge remote-tracking branch 'upstream/master'