完善登录功能
Merge branch 'master' of
https://github.com/429365799/Android-Traning.git

Conflicts:
	MediaPlayer/bin/MediaPlayer.apk
	MediaPlayer/bin/classes.dex
	MediaPlayer/bin/dexedLibs/gson-1.7.1-0c6d20b19e8ae3a7a4e5bdbf0de80839.jar
	MediaPlayer/bin/dexedLibs/jdom-2.0.5-7dec94f10eb23282700ecf7966807b5f.jar
	MediaPlayer/bin/resources.ap_
	MediaPlayer/src/com/mediaplayer/activity/LocalTabActivity.java