Merge origin/master

Conflicts:
	web/createMusic.xhtml
Merge origin/master