Fix #836 Option to enable converting linebreaks to <br> on importing the image IPTCcaption (description) [Thanks to MarkRH];
Zenpage plugin has now an option to enable/disable news and/or pages on the backend – themes require modifcation to support this, included themes have been updated;
Some formatting cleanup on some theme pages.
Merge remote-tracking branch 'upstream/master' into upstream0707

Conflicts:
	themes/basic/album.php
	themes/basic/archive.php
	themes/basic/favorites.php
	themes/basic/image.php
	themes/zenpage/image.php
	themes/zpmobile/functions.php
	zp-core/class-image.php
	zp-core/zp-extensions/zenpage.php

	modified:   themes/basic/album.php
	modified:   themes/basic/archive.php
	modified:   themes/basic/favorites.php
	modified:   themes/basic/image.php
	modified:   themes/basic/register.php
	modified:   themes/effervescence+/sidebar.php
	modified:   themes/zenpage/album.php
	modified:   themes/zenpage/archive.php
	modified:   themes/zenpage/favorites.php
	modified:   themes/zenpage/gallery.php
	modified:   themes/zenpage/image.php
	modified:   themes/zenpage/news.php
	modified:   themes/zenpage/pages.php
	modified:   themes/zenpage/sidebar.php
	modified:   themes/zpmobile/archive.php
	modified:   themes/zpmobile/functions.php
	modified:   zp-core/admin-globals.php
	modified:   zp-core/zp-extensions/debug/admin_tab.php
	modified:   zp-core/zp-extensions/zenpage.php
	modified:   zp-core/zp-extensions/zenpage/classes.php
	modified:   zp-core/zp-extensions/zenpage/template-functions.php
theme updates for optional zenpage items