合并代码
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/src/com/mediaplayer/activity/LocalMediaStoreActivity.java
	MediaPlayer/src/com/mediaplayer/tasks/LoadLocalMediaTask.java
大文件上传（未完成）