preparing to rebase
Merge branch 'blogview'

Conflicts:
	$tf/localversion.tfb
	$tf/pendingchanges.tfb