aa
Merge branch 'master' of git@github.com:yuanxiaoming/leshi.git
Merge branch 'master' of git@github.com:yuanxiaoming/leshi.git
11
Merge branch 'master' of git@github.com:yuanxiaoming/leshi.git
111
Merge branch 'master' of git@github.com:yuanxiaoming/leshi.git

Conflicts:
	leyu/src/com/ch/leyu/application/CLYApplication.java
	leyu/src/com/ch/leyu/ui/NewsFragment.java
	leyu/src/com/ch/leyu/ui/VideoPlayActivity.java
Merge branch 'master' of git@github.com:yuanxiaoming/leshi.git

Conflicts:
	leyu/src/com/ch/leyu/ui/HSNewsFragment.java