Merge origin/master

Conflicts:
	web/listAllMusics.xhtml
Merge origin/master