User music in profile page finished
Merge branch 'master' of https://github.com/chaninz/bandbrary

Conflicts:
	application/controllers/user/music.php