Merge pull request #3 from eoecn/master

版本1.1.0
Merge pull request #4 from eoecn/master

update
Merge remote-tracking branch 'eoecn/master'
Merge branch 'master' of https://github.com/feicien/android-app
add weixin scan line
scan Screenshots
Merge pull request #88 from feicien/master

添加微信那样的扫描线