Merge pull request #1 from eoecn/master

和eoe的保持代码同步
Merge pull request #39 from yeungeek/master

修改二维码扫描的界面
Merge pull request #2 from eoecn/master

gengxin
revert old file because yjl commmit have a bug
Merge pull request #45 from com360/master

MainActivity.java回退到上个版本，退出连续播放动画有bug。
solve exception:can't instantiate class cn.eoe.app.view.NewsFragment; no empty constructor
Merge pull request #48 from king0769/master

修复因找不到类NewsFragment的无参构造函数导致的force close
add two dimition code login
Merge pull request #49 from com360/master

增加二维码登陆功能（add tow dimition code login method）
修改about信息，添加开源相关信息
edite loginactivity some text String
Merge pull request #51 from com360/master

修改用户登录页面的一些文字信息，按钮信息
Merge pull request #50 from IceskYsl/master

修改about信息
add sample pictrue
解决由于UTF-8 with BOM导致idea下编译失败的问题 fix #37
eidte versioncode and version name
Merge pull request #54 from com360/master

替换如何找到二维码密钥图片及更改版本号和版本名称
Merge pull request #53 from rockybean/master

解决由于UTF-8 with BOM导致idea下编译失败的问题 fix #37，（看着代码没问题，先merge了测试一下）
sm.setBehindScrollScale(0)
Merge pull request #61 from vincent4j/master

SlidingMenu.setBehindScrollScale(0)