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

Conflicts:
	music/src/main/webapp/WEB-INF/views/user/join_step1.jsp
...