ppppppp
Merge branch 'NewFixedBranch' of https://github.com/eqmn/Music into NewFixedBranch

Conflicts:
	#Music/ViewControllers/Musics/MusicsViewController.m