z
Merge branch 'master' of https://github.com/eqmn/Music

Conflicts:
	#Music/ViewControllers/FooterPlayer/PlayerItemView.m