Merge pull request #87 from sbillard/master

07282014
Merge pull request #88 from sbillard/master

admin user field issues
Merge pull request #89 from sbillard/master

linkPicker icon for article lists was missing
Merge pull request #90 from sbillard/master

Fix two issues
Merge pull request #91 from sbillard/master

prevent urlencoding "!"
Merge pull request #92 from sbillard/master

pathurlencode fixes
Merge pull request #93 from sbillard/master

saving empty language string items
release 1.0.0
release id 0e5943945e
Merge branch 'master' of https://github.com/sbillard/ZenPhoto20-DEV

Conflicts:
	zp-core/version.php

	modified:   docs/release notes.htm
	modified:   plugins/cookieInvalidator.php
	modified:   plugins/customFieldExtender.php
	modified:   plugins/pluginEnabler.php
	modified:   themes/effervescence+/functions.php
	modified:   themes/zpArdoise/album.php
	modified:   themes/zpArdoise/favorites.php
	modified:   themes/zpArdoise/functions.php
	modified:   themes/zpArdoise/inc_footer.php
	modified:   themes/zpArdoise/inc_header.php
	modified:   zp-core/admin-dynamic-album.php
	modified:   zp-core/admin-edit.php
	modified:   zp-core/admin-functions.php
	modified:   zp-core/admin-globals.php
	modified:   zp-core/admin-tags.php
	modified:   zp-core/admin-users.php
	modified:   zp-core/admin.css
	modified:   zp-core/admin.php
	modified:   zp-core/auth_zp.php
	modified:   zp-core/class-search.php
	modified:   zp-core/classes.php
	modified:   zp-core/cron_runner.php
	modified:   zp-core/functions-controller.php
	modified:   zp-core/functions.php
	modified:   zp-core/index.php
	modified:   zp-core/lib-auth.php
	modified:   zp-core/setup/index.php
	modified:   zp-core/setup/setup-option-defaults.php
	modified:   zp-core/template-functions.php
	modified:   zp-core/utilities/backup_restore.php
	modified:   zp-core/utilities/database_reference.php
	modified:   zp-core/utilities/gallery_statistics.php
	modified:   zp-core/utilities/refresh_database.php
	modified:   zp-core/utilities/refresh_metadata.php
	modified:   zp-core/utilities/reset_albumthumbs.php
	modified:   zp-core/version.php
	modified:   zp-core/zenphoto-rewrite.txt
	modified:   zp-core/zp-extensions/auto_backup.php
	modified:   zp-core/zp-extensions/cacheManager.php
	modified:   zp-core/zp-extensions/cloneZenphoto.php
	modified:   zp-core/zp-extensions/cloneZenphoto/clone.php
	modified:   zp-core/zp-extensions/cloneZenphoto/cloneTab.php
	modified:   zp-core/zp-extensions/common/fieldExtender.php
	modified:   zp-core/zp-extensions/debug.php
	modified:   zp-core/zp-extensions/debug/admin_tab.php
	modified:   zp-core/zp-extensions/deprecated-functions.php
	modified:   zp-core/zp-extensions/downloadList.php
	modified:   zp-core/zp-extensions/favoritesAlbums.php
	modified:   zp-core/zp-extensions/favoritesAlbums/admin-album.php
	modified:   zp-core/zp-extensions/favoritesHandler.php
	modified:   zp-core/zp-extensions/favoritesHandler/favoritesClass.php
	modified:   zp-core/zp-extensions/hitcounter.php
	modified:   zp-core/zp-extensions/menu_manager.php
	modified:   zp-core/zp-extensions/publishContent.php
	modified:   zp-core/zp-extensions/rating.php
	modified:   zp-core/zp-extensions/rewriteRules.php
	modified:   zp-core/zp-extensions/search_statistics.php
	modified:   zp-core/zp-extensions/seo_cleanup.php
	modified:   zp-core/zp-extensions/site_upgrade.php
	modified:   zp-core/zp-extensions/sitemap-extended.php
	modified:   zp-core/zp-extensions/userAddressFields.php
	modified:   zp-core/zp-extensions/user_groups.php
	modified:   zp-core/zp-extensions/user_groups/user_groups-tab.php
	modified:   zp-core/zp-extensions/user_mailing_list.php
	modified:   zp-core/zp-extensions/wordpress_import.php
	modified:   zp-core/zp-extensions/zenpage.php
	modified:   zp-core/zp-extensions/zenpage/admin-edit.php
	modified:   zp-core/zp-extensions/zenpage/template-functions.php
	modified:   zp-core/zp-extensions/zenpotoCompatibilityPack.php
left in debug statement
Merge remote-tracking branch 'origin/master' into mediaFields