Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/version.php

	modified:   zp-core/admin-themes.php
	modified:   zp-core/classes.php
	modified:   zp-core/dataaccess
	modified:   zp-core/functions-basic.php
	modified:   zp-core/functions-config.php
	modified:   zp-core/githead
	modified:   zp-core/setup/index.php
	modified:   zp-core/setup/setup-option-defaults.php
	modified:   zp-core/zenphoto_cfg.txt
	modified:   zp-core/zp-extensions/site_upgrade/site_upgrade.php
Merge remote-tracking branch 'origin/master' into 1.4.6
Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/version.php

	modified:   index.php
	modified:   zp-core/githead
	modified:   zp-core/zp-extensions/publishContent/publishContent.php
French update

Apart from EXIF strings, one more needs to be corrected and translated
fix #542
package update
Merge remote-tracking branch 'origin/master' into 1.4.6

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

	modified:   zp-core/admin-functions.php
	modified:   zp-core/zp-extensions/seo_cleanup.php
French update
TinyMCE 4.x plugin to later replace the tiny_mce (3.x) plugin (for now kept side by side). Notes:
a) tinyZenpage is working but with an (official) workaround to make the old 3.x API work. Needs to be figured out how to update that.
b) elFinder needs to be configured differently if it should work with 4.x. There is a tutorial on its site though.
c) There are no languages included (their naming convention issues)
d) The buttons currently are jumping because our css overrides the editor css here. To be fixed sometime soon.
tinymce4 should include its own API 3.x compatibility plugin and not the one from the 3.x tiny_mce plugin!
Adds tinymce4 language to all we have ZP ones for.
Handle sub-locales

NOTE: it appears that the TinyMCE configuration files will override this
code. That needs to be changed.
Merge remote-tracking branch 'origin/master' into 1.4.6

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

	modified:   zp-core/zp-extensions/seo_cleanup.php
	modified:   zp-core/zp-extensions/tiny_mce.php
	modified:   zp-core/zp-extensions/zenpage/zenpage-template-functions.php
remove wrong setting of $locale
Merge remote-tracking branch 'origin/master' into 1.4.6
elFinder integration with tinyMCE 4

The configuration files need to be updated to include the filemanager
stuff, so this is not tested for tinyMCE4 yet.

According to the documentation, the difference between TM3 and TM4 is
that in the tinyMCE init the elFinderBrowser should not have the
quotations
http://stackoverflow.com/questions/16016870/tinymce-4-with-elfinder
french update
Some doc update to tinymce4 plugin and removal of obsolete options
Merge remote-tracking branch 'origin/master' into 1.4.6
clarify error handling