Add tinyzenpage for gallery tinymce configs
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/zp-extensions/tinymce4/config/zenphoto-basic.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-slim.js.php
Merge remote-tracking branch 'origin/master' into mediaFields