update musique+update album photo wall
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	assets/javascript/slyset.js