...
Merge remote-tracking branch 'origin/master'

Conflicts:
	music/src/main/webapp/ma2rix/html/composition/register.html
...
Merge remote-tracking branch 'origin/master'