comment all lines : $coord['desc'] = '<p align=center>'.$coord['desc'].'</p>';

this line is useless because the description is correctly managed by the
plugin
Small German update
Dutch translation
Merge pull request #267 from zenphoto/Dutch-translation-Dev

Dutch translation
Release version 1.4.2.2

fix #261
release id 2fc70d6803
Flag master build as support release
Merge remote-tracking branch 'vincent3569/master' into 1.4.5

Conflicts:
	themes/effervescence_plus/simpleviewer/functions.php (removed)
slovak translation update
remove check for latest version from setup

setup cannot continue with this check if the Zenphoto site is down.
removes commented lines from 9f605db952f40bce46ff798afc3fd99128d40e6b
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/githead
	zp-core/setup/index.php
	zp-core/version.php

	modified:   zp-core/githead
	modified:   zp-core/locale/de_DE/LC_MESSAGES/zenphoto.mo
	modified:   zp-core/locale/de_DE/LC_MESSAGES/zenphoto.po
	modified:   zp-core/locale/sk_SK/LC_MESSAGES/zenphoto.mo
	modified:   zp-core/locale/sk_SK/LC_MESSAGES/zenphoto.po
	modified:   zp-core/setup/index.php
Makes all use of checkForUpdate depenent on the option being enabled
release id 0e614561ae
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/githead

	modified:   zp-core/githead
removes getCategoryStructure()

This was a one-time call so the function is moved to the constructor to
prevent people from thinking they should use the function
Merge remote-tracking branch 'origin/1.4.5' into zenpage-class-sortorders

Conflicts:
	zp-core/zp-extensions/zenpage/zenpage-class.php

	modified:   themes/effervescence_plus/colorbox/functions.php
	modified:   themes/effervescence_plus/favorites.php
	modified:   themes/effervescence_plus/image_gallery/functions.php
	modified:   themes/effervescence_plus/image_page/functions.php
	modified:   themes/garland/colorbox/functions.php
	modified:   themes/garland/image_gallery/functions.php
	modified:   themes/garland/image_page/functions.php
	modified:   zp-core/admin.php
	modified:   zp-core/githead
	modified:   zp-core/locale/de_DE/LC_MESSAGES/zenphoto.mo
	modified:   zp-core/locale/de_DE/LC_MESSAGES/zenphoto.po
	modified:   zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.mo
	modified:   zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.po
	modified:   zp-core/locale/sk_SK/LC_MESSAGES/zenphoto.mo
	modified:   zp-core/locale/sk_SK/LC_MESSAGES/zenphoto.po
	modified:   zp-core/setup/index.php
	modified:   zp-core/version.php
	modified:   zp-core/zp-extensions/check_for_update.php
	modified:   zp-core/zp-extensions/zenpage/zenpage-class-news.php
	modified:   zp-core/zp-extensions/zenpage/zenpage-class.php
No point in sorting elements that will be removed

Makes the sort go faster if it is on fewer elements