French update (mostly corrections to the user guide)
Remove debug echo
Merge remote-tracking branch 'upstream/master' into upstream0720

Conflicts:
	zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.mo
	zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.po
	zp-core/template-functions.php