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

Conflicts:
	music/src/main/java/com/ma2rix/music/manager/Ma2rixFileManger.java
	music/src/main/java/com/ma2rix/music/web/controller/ArrangementController.java
	music/src/main/webapp/resources/js/ui.js
....
Merge branch 'master' of https://github.com/topayc/ma2rix.git
directory 조정