wpseo frontend tests
Merge branch 'master' of github.com:Yoast/wordpress-seo

Conflicts:
	frontend/class-frontend.php