Package file was wrong
Hopefully fix for #839
Directionality support for TinyMCE config files - fix #849
cleanup
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/class-search.php
	zp-core/zenphoto.package
	zp-core/zp-extensions/tinymce4/config/comment-full.js.php
	zp-core/zp-extensions/tinymce4/config/comment-ribbon.js.php
	zp-core/zp-extensions/tinymce4/config/comment-slim.js.php
	zp-core/zp-extensions/tinymce4/config/zenpage-basic.js.php
	zp-core/zp-extensions/tinymce4/config/zenpage-classic.js.php
	zp-core/zp-extensions/tinymce4/config/zenpage-full.js.php
	zp-core/zp-extensions/tinymce4/config/zenpage-light.js.php
	zp-core/zp-extensions/tinymce4/config/zenpage-ribbon.js.php
	zp-core/zp-extensions/tinymce4/config/zenpage-slim.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-basic.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-classic.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-full.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-light.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-ribbon.js.php
	zp-core/zp-extensions/tinymce4/config/zenphoto-slim.js.php

	modified:   zp-core/functions-config.php
Merge pull request #116 from sbillard/master

upstream merge