add portal_url and portal_title

Conflicts:
	plone/stringinterp/tests/substitutionTests.txt