"pushing basic playlists before more gets broken"
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/generated/source/r/debug/com/hech/musicplayer/R.java
	app/src/main/java/com/hech/musicplayer/SongFragment.java
"pushing basic playlists before more gets broken"