add portal_url and portal_title

Conflicts:
	plone/stringinterp/tests/substitutionTests.txt
Merge branch 'master' of git://github.com/plone/plone.stringinterp