OpenGraph image tags will now also be added for images added to the post via shortcodes, as suggested by msebald
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo into Enhancement-og-images-resolve-shortcode

Conflicts:
	frontend/class-opengraph.php
	readme.txt
Merge pull request #117 from jrfnl/Enhancement-og-images-resolve-shortcode

Enhancement: resolve shortcodes to retrieve og images