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

Conflicts:
6125beta6125/ajax/ajaxprocessform.php
Merge branch 'master' of https://github.com/Kodiak42/eqrd

Conflicts:
	6125beta6125/ajax/ajaxprocessform.php