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'
[affiliate_link] shortcode
Merge remote-tracking branch 'upstream/master'
Add support for images hosted off-site
Updated the French translation
Merge pull request #259 from seb86/master

Updated the French translation
Merge pull request #257 from sumobi/languages

Czech translation
https://github.com/affiliatewp/AffiliateWP/issues/238
Add account email
Merge pull request #263 from sumobi/admin

Show updated notice when settings are updated
Minor formatting & save user account email
minor formatting