Selfless sync
Merge branch 'master' of https://github.com/Kodiak42/eqrd

Conflicts:
	6125beta6125/themes/default/css/main.css
	6125beta6125/views/musicmanager/index.php