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

Conflicts:
	music/src/main/webapp/ma2rix/common/css/common.css
	music/src/main/webapp/ma2rix/common/css/js.css
Merge branch 'master' of https://github.com/topayc/ma2rix
Merge branch 'master' of https://github.com/topayc/ma2rix
...