null
网络页面读取
有病的BIN文件夹
Merge branch 'master' of
https://github.com/429365799/Android-Traning.git

Conflicts:
	MediaPlayer/bin/MediaPlayer.apk
	MediaPlayer/bin/classes.dex
	MediaPlayer/src/com/mediaplayer/activity/NetTabActivity.java
各种修改