Fix some user guide/troubleshooting links in the setup page
Fixes issue (unwanted untitled articles created) with icon links of Zenpage news article admin if other parameters are set already.
Fixes wrong link in mergedRSS plugin
Improvements for mergedRSS plugin: The feed itself is now cached instead of each feed used separately; Only external feeds are still cached always separately; Cache files now have a proper .xml suffix.
TinyMCE 4.1
Correct package file
facebox
Revert "facebox"

This reverts commit f8f854ff3901a023d52786c1d1956518d89457e2.
facebox
dirtyforms
Merge remote-tracking branch 'upstream/master' into upstream0706

Conflicts:
	zp-core/setup/index.php
	zp-core/zenphoto.package
	zp-core/zp-extensions/mergedRSS.php
	zp-core/zp-extensions/tinymce/plugins/media/plugin.min.js
	zp-core/zp-extensions/tinymce/skins/lightgray/skin.ie7.min.css
	zp-core/zp-extensions/tinymce/skins/lightgray/skin.min.css
	zp-core/zp-extensions/tinymce4/config/zenpage-light.js.php
	zp-core/zp-extensions/tinymce4/plugins/autolink/plugin.min.js
	zp-core/zp-extensions/tinymce4/plugins/charmap/plugin.min.js
	zp-core/zp-extensions/tinymce4/plugins/image/plugin.min.js
	zp-core/zp-extensions/tinymce4/plugins/link/plugin.min.js
	zp-core/zp-extensions/tinymce4/plugins/lists/plugin.min.js
	zp-core/zp-extensions/tinymce4/plugins/paste/plugin.min.js
	zp-core/zp-extensions/tinymce4/plugins/preview/plugin.min.js
	zp-core/zp-extensions/tinymce4/plugins/spellchecker/plugin.min.js
	zp-core/zp-extensions/tinymce4/plugins/table/plugin.min.js
	zp-core/zp-extensions/tinymce4/plugins/textcolor/plugin.min.js
	zp-core/zp-extensions/tinymce4/themes/modern/theme.min.js
	zp-core/zp-extensions/tinymce4/tinymce.min.js
	zp-core/zp-extensions/zenpage/admin-news-articles.php

	modified:   zp-core/zp-extensions/mergedRSS.php
	modified:   zp-core/zp-extensions/zenpage/admin-news-articles.php
Restore files deleted by merge
dirty form warning message
failed merge
Merge pull request #61 from sbillard/master

07062014