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

Conflicts:
	music/src/main/resources/com/ma2rix/music/dao/mapper/ArrangementMapper.xml
	music/src/main/webapp/WEB-INF/views/include/top.jsp
Merge branch 'master' of https://github.com/topayc/ma2rix.git
...