Merge branch 'master' of git://github.com/Yoast/wordpress-seo

Conflicts:
	admin/class-admin.php
	readme.txt