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

Conflicts:
	music/src/main/java/com/ma2rix/music/model/command/ArrangementCommand.java
ghjghjg