MP3 Player
Merge branch 'master' of https://github.com/goodow/drive-android

Conflicts:
	src/main/java/com/goodow/drive/android/activity/MainActivity.java