1111111111111111
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
Merge branch 'develop' into gongsi
11111111111111

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

Conflicts:
	weipai/src/com/weipai/fragment/VideoFragment.java