11111111111111111111111111

Signed-off-by: li <li@163.com>
Merge branch 'develop' into jia

Conflicts:
	weipai/src/com/weipai/adapter/DownloadAdapter.java
	weipai/src/com/weipai/fragment/DownlodFragment.java