Hide terms checkbox if not set
Disable checking if terms checkbox is checked
combined two conditionals into one
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/register.php
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
No such user error message
Merge pull request #269 from sumobi/login

No such user error message
Merge pull request #227 from tubiz/master

Hide terms checkbox if not set
Merge branch 'master' of https://github.com/affiliatewp/AffiliateWP into registration