Merge pull request #68 from sbillard/master

fix link issues
Merge pull request #69 from sbillard/master

tinyMCE:obj updates
Merge pull request #70 from sbillard/master

July 17, 18
French update
Merge pull request #71 from sbillard/master

July 19,20
Merge remote-tracking branch 'upstream/master'
RC7 tag
release id 097993bd19
French update + zp-extensions/debug/admin_tab.php:  Languange (3 times)
Merge pull request #73 from sbillard/master

clone test fixes
release id d4603481ca
Merge pull request #72 from michgagnon/master

Update to French translation
RC8 tag
fix typo in version string
release id 3cfa8ab2e2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zp-core/githead