Fixed changelog bug and added contributor
Removed screen_icon() calls
Readme update
Various small updates
Fix double robots header, WP native settings will (and should) be respected
readme
Merge branch 'yoast/master' and branch 'Fix-double-robots' into Fix-settings-issues

Conflicts:
	admin/class-config.php
	frontend/class-frontend.php
	readme.txt
Overwrite global singular robot values on singular items with singular specific robot items

Fixes #562
Merge of "Fixed a bug in robots meta tag on singular items"

Merge git://github.com/jdevalk/wordpress-seo into Fix-settings-issues

Conflicts:
	frontend/class-frontend.php
	readme.txt
Replaced hard-coded meta key prefix with class property

Also: bugfix where old AIOSEO data would overwrite newer AISOSEO data
Undid bugfix for something which turned out not to be a bug ;-)
Rewrite of the replace_meta() method taking unsaved default values into account

See the following comments for the rationale:
https://github.com/Yoast/wordpress-seo/issues/463#issuecomment-32203252
https://github.com/Yoast/wordpress-seo/issues/463#issuecomment-32225455

Basic functionality of the method stays the same.
Refactored do_meta_box() and WPSEO_Meta::get_value()

Extra info concerning do_meta_box:
* Don't show robots index/no-index choice in advanced meta box if there is a blog-wide override in place
* Fixed: $rows field definition was not being respected
* Fixed for the most part: $class field definition wasn't always respected
* Fixed: robots advanced 'none' was not being translated
* Fixed: robots index and robots follow defaults were wrong, leading to inconsistent form display
* Use WP selected() and checked() functions where appropriate
* Removed 'divtext' case as that would cause double output of the description text

Extra info concerning get_value():
* Will now return the default value if no value was set and a default value is available, otherwise will return null

Also:
* Extensively documented the meta form field definition property
* Added form name/id prefix static to meta class - has @todo attached still for js implementation
* Fixed typo in earlier admin page function rewrite
* Fixed double-remove of wp_no_robots actions in class frontend
whitespace
comment clarification