Fixed %%page%% variable not being replaced when on pages

Issue #801
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-801-page-variable-for-pages

Conflicts:
	readme.txt
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-801-page-variable-for-pages
Make it work for a post types, cpt included
Merge pull request #805 from jrfnl/Issue-801-page-variable-for-pages

Fixed %%page%% variable not being replaced when on pages