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

Conflicts:
	6125beta6125/views/songtemplate/index.php
Merge branch 'master' of https://github.com/Kodiak42/eqrd