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

Conflicts:
	music/src/main/java/com/ma2rix/music/web/controller/UploadCotroller.java
Merge branch 'master' of https://github.com/topayc/ma2rix
...
...
...
Merge branch 'master' of https://github.com/topayc/ma2rix
Merge branch 'master' of https://github.com/topayc/ma2rix
Merge branch 'master' of https://github.com/topayc/ma2rix
...
Merge branch 'master' of https://github.com/topayc/ma2rix
...
...
Merge branch 'master' of https://github.com/topayc/ma2rix
Merge branch 'master' of https://github.com/topayc/ma2rix
..
Merge branch 'master' of https://github.com/topayc/ma2rix

Conflicts:
	music/src/main/java/com/ma2rix/music/web/controller/UploadCotroller.java
...
...
...
...