...
...
Merge remote-tracking branch 'origin/master'
...
,,,
Merge branch 'master' of https://github.com/topayc/ma2rix

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