添加进度条
Merge branch 'master' of
https://github.com/429365799/Android-Traning.git

Conflicts:
	MediaPlayer/bin/MediaPlayer.apk
	MediaPlayer/bin/classes.dex
	MediaPlayer/bin/resources.ap_
	MediaPlayer/res/values/strings.xml
	MediaPlayer/src/com/mediaplayer/activity/LocalTabActivity.java
完善上传功能
Merge branch 'master' of https://github.com/429365799/Android-Traning.git