TinyMCE 4.1.6
jPlayer 2.8.1
zpmobile jquery-mobile 1.4.5
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/zenphoto.package
	zp-core/zp-extensions/tinymce/skins/lightgray/fonts/tinymce-small.dev.svg
	zp-core/zp-extensions/tinymce/skins/lightgray/fonts/tinymce.dev.svg
	zp-core/zp-extensions/tinymce4/plugins/paste/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/tinymce.min.js

	modified:   themes/zpmobile/functions.php
	deleted:    themes/zpmobile/jquerymobile/jquery.mobile-1.4.2.min.js
	deleted:    themes/zpmobile/jquerymobile/jquery.mobile-1.4.2.min.map
	renamed:    themes/zpmobile/jquerymobile/jquery.mobile-1.4.2.min.css -> themes/zpmobile/jquerymobile/jquery.mobile-1.4.5.min.css
	new file:   themes/zpmobile/jquerymobile/jquery.mobile-1.4.5.min.js
	new file:   themes/zpmobile/jquerymobile/jquery.mobile-1.4.5.min.map
	modified:   zp-core/zenphoto.package
	deleted:    zp-core/zp-extensions/jplayer/js/Jplayer.swf
	modified:   zp-core/zp-extensions/jplayer/js/jplayer.playlist.min.js
	deleted:    zp-core/zp-extensions/jplayer/js/jquery.jplayer.inspector.js
	new file:   zp-core/zp-extensions/jplayer/js/jquery.jplayer.inspector.min.js
	modified:   zp-core/zp-extensions/jplayer/js/jquery.jplayer.min.js
	new file:   zp-core/zp-extensions/jplayer/js/jquery.jplayer.swf
	deleted:    zp-core/zp-extensions/jplayer/js/popcorn.jplayer.js
	new file:   zp-core/zp-extensions/jplayer/js/popcorn.jplayer.min.js
	modified:   zp-core/zp-extensions/jplayer/skin/blue.monday/jplayer.blue.monday.css
	modified:   zp-core/zp-extensions/jplayer/skin/blue.monday/jplayer.blue.monday.jpg
	modified:   zp-core/zp-extensions/jplayer/skin/blue.monday/jplayer.blue.monday.seeking.gif
	modified:   zp-core/zp-extensions/jplayer/skin/blue.monday/jplayer.blue.monday.video.play.png
	new file:   zp-core/zp-extensions/jplayer/skin/blue.monday/mustache/jplayer.blue.monday.audio.playlist.html
	new file:   zp-core/zp-extensions/jplayer/skin/blue.monday/mustache/jplayer.blue.monday.audio.single.html
	new file:   zp-core/zp-extensions/jplayer/skin/blue.monday/mustache/jplayer.blue.monday.audio.stream.html
	new file:   zp-core/zp-extensions/jplayer/skin/blue.monday/mustache/jplayer.blue.monday.video.playlist.html
	new file:   zp-core/zp-extensions/jplayer/skin/blue.monday/mustache/jplayer.blue.monday.video.single.html
	new file:   zp-core/zp-extensions/jplayer/skin/circle.player/bgr.jpg
	new file:   zp-core/zp-extensions/jplayer/skin/circle.player/buffer.png
	new file:   zp-core/zp-extensions/jplayer/skin/circle.player/circle.player.css
	new file:   zp-core/zp-extensions/jplayer/skin/circle.player/controls.jpg
	new file:   zp-core/zp-extensions/jplayer/skin/circle.player/progress.png
	new file:   zp-core/zp-extensions/jplayer/skin/circle.player/progress_sprite.jpg
	modified:   zp-core/zp-extensions/jplayer/skin/pink.flag/jplayer.pink.flag.css
	modified:   zp-core/zp-extensions/jplayer/skin/pink.flag/jplayer.pink.flag.jpg
	modified:   zp-core/zp-extensions/jplayer/skin/pink.flag/jplayer.pink.flag.seeking.gif
	modified:   zp-core/zp-extensions/jplayer/skin/pink.flag/jplayer.pink.flag.video.play.png
	new file:   zp-core/zp-extensions/jplayer/skin/pink.flag/mustache/jplayer.pink.flag.audio.playlist.html
	new file:   zp-core/zp-extensions/jplayer/skin/pink.flag/mustache/jplayer.pink.flag.audio.single.html
	new file:   zp-core/zp-extensions/jplayer/skin/pink.flag/mustache/jplayer.pink.flag.audio.stream.html
	new file:   zp-core/zp-extensions/jplayer/skin/pink.flag/mustache/jplayer.pink.flag.video.playlist.html
	new file:   zp-core/zp-extensions/jplayer/skin/pink.flag/mustache/jplayer.pink.flag.video.single.html
restore language files
Merge branch 'upstream'
Fixes inconsistent Search button naming in Basic theme.
Merge remote-tracking branch 'upstream/master'
Missing checks for Zenpage news and/or pages being enabled on themes' search.php
Login page fixes
Merge remote-tracking branch 'upstream/master' into upstream

Note, the changes made to zenphoto are pure garbage. The proper way to do this has been in
ZenPhoto20 for ages and involves not returning a page/news count if the feature is disabled.

But any way, the change was useful. It did force me to figure out how to do a merge without
necessarily taking the changes even though they could be applied without conflict.

	modified:   themes/basic/album.php
borrow foil questions from other users
Merge pull request #219 from sbillard/master

11.18.2014