Update class-admin.php

The blocking access to robots error message div had the same ID as the Plugin Activated message div meaning when a user clicked 'I know, don't bug me' it actually removed the Plugin Activated div as it appears first in the DOM. Fixed by changing the ID of the div to robotsmessage
Issue #911 - fix media upload js files not always available on cpt
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-911-enqueue-media

Conflicts:
	readme.txt
Fix PHP notice on new messages
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Fix-PHP-notice-new-post
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-911-enqueue-media
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Fix-PHP-notice-new-post
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-911-enqueue-media
Fix for disabled ctype extension *sigh*
add remaining opengraph class tests
added first wpseo_frontend class tests
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Fix-PHP-notice-new-post
Fix PHP warnings when post_type is an array
Removed uninstall procedure.
changelog update
Merge pull request #948 from SergeyBiryukov/master

Fix PHP warnings when post_type is an array
Changelog update.
Merge branch 'master' of github.com:Yoast/wordpress-seo
Update wordpress-seo pot file.
Adding Grunt the the project.

These files probably need to be added to the exclude section of the
build & deploy script.