...
Merge branch 'master' of https://github.com/topayc/ma2rix
Merge branch 'master' of https://github.com/topayc/ma2rix

Conflicts:
	music/src/main/webapp/ma2rix/html/ingArrangement/list.html
...
..
mmmmm
Merge branch 'master' of https://github.com/topayc/ma2rix