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

This reverts commit d078dcdc3691c5749cc43eed45609939810ff534, reversing
changes made to af32b9a8960df1f6e4dcf14d531405b0ad9b0c0f.
Revert "Revert "Merge branch 'master' of https://github.com/Kodiak42/eqrd""

This reverts commit e2214c5ecccbb27a4417253a9f0c7377502c4835.
Revert "Revert "Revert "Merge branch 'master' of https://github.com/Kodiak42/eqrd"""

This reverts commit 2f3bb4d5c5cd9ca75bae715c972560bfbbe60cbc.
Revert "Merge branch 'master' of https://github.com/Kodiak42/eqrd"

Conflicts:
	6125beta6125/themes/default/css/main.css
	6125beta6125/themes/global/js/main.js