line endings because of new .gitattributes
Merge jrfnl/wordpress-seo/tree/Fix-settings-issues to release/1.5
Prevent the SEO score filter from displaying on a post type overview page if the metabox has been hidden for the post type as suggested by [coreyworrell](https://github.com/coreyworrell) in issue [#601](https://github.com/Yoast/wordpress-seo/issues/601).
Two typos as reported in #605
Removed the `pt_is_public()` method in favour of `is_metabox_hidden()` method -> better solution for issue [#601](https://github.com/Yoast/wordpress-seo/issues/601).
Merge remote-tracking branch 'jdevalk/release/1.5' into Fix-settings-issues
Fixed two small js bugs

* Autocomplete spinner kept spinning
* Reverted earlier change which prevented focus kw div to show up
Updated readme to indicate solution for issues #571, #606 which were already solved by changed options handling.
Reverted WPSEO_VERSION check
merged wp-seo.php
added premium git ignore rules
Merge remote-tracking branch 'Yoast/master' into Fix-settings-issues

Conflicts:
	wp-seo.php
Merge remote-tracking branch 'Yoast/release/1.5' into Fix-settings-issues

Conflicts:
	wp-seo.php
WPSEO Premium changes
Merge branch 'pr/n2_Faison' into Fix-settings-issues
Tidy up merge from PR2

- typo
- translatable failure messages from ajax
- $_GET sanitizing
- code style
Added security check to plugin file
Merge pull request #622 from Yoast/feature/wpseo-premium-merge

WPSEO Premium changes
Fixed bug of my own creation ;-)