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

Conflicts:
	music/src/main/java/com/ma2rix/music/model/domain/Genre.java
	music/src/main/java/com/ma2rix/music/web/controller/ArrangementController.java
	music/src/main/webapp/WEB-INF/views/arrange/arrangeUpdateForm.jsp
	music/src/main/webapp/WEB-INF/views/include/top.jsp
...