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

Conflicts:
	music/src/main/webapp/resources/common/js/ui.js