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.
Explicitly add the LICENSE file for lack of confusion

License was previously valid due to being linked from the Admin License link, and included in a URL from zp-core/licence.php. However, this inclusion clears up any confusion about the licensing terms.
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
Changes to the Zenpage option to disable news or pages: Instead of a class property we now use constants since those are global options. Official themes are also setup to not only hide but to generally block disabled items.
minor cleanup
language files
Merge remote-tracking branch 'upstream/master' into upstream0807

Conflicts:
	themes/effervescence+/news.php
	themes/effervescence+/pages.php
	themes/effervescence+/sidebar.php
	themes/garland/news.php
	themes/garland/pages.php
	themes/garland/sidebar.php
	themes/zenpage/archive.php
	themes/zenpage/gallery.php
	themes/zenpage/index.php
	themes/zenpage/news.php
	themes/zenpage/pages.php
	themes/zenpage/sidebar.php
	themes/zpmobile/archive.php
	themes/zpmobile/functions.php
	themes/zpmobile/news.php
	themes/zpmobile/pages.php
	zp-core/admin-globals.php
	zp-core/zp-extensions/zenpage.php
	zp-core/zp-extensions/zenpage/classes.php

	new file:   LICENSE
	modified:   zp-core/zp-extensions/zenpage/classes.php
Don't butcher the kings English
documentation
Merge pull request #63 from sbillard/master

cumulative changes