remove improper use of setOptionDefault
optimize master user handling
remove improper use of setOptionDefault
Wrong plugin enable setting
Better display if E_STRICT is not set
Handle mis-configured session paths
Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/setup/setup-option-defaults.php

	modified:   zp-core/admin.php
	modified:   zp-core/class-album.php
	modified:   zp-core/cron_runner.php
	modified:   zp-core/functions-basic.php
	modified:   zp-core/functions.php
	modified:   zp-core/lib-GD.php
	modified:   zp-core/lib-auth.php
	modified:   zp-core/setup/index.php
	modified:   zp-core/setup/setup-option-defaults.php
	modified:   zp-core/zp-extensions/class-video.php
	modified:   zp-core/zp-extensions/colorbox_js.php
	modified:   zp-core/zp-extensions/comment_form.php
	modified:   zp-core/zp-extensions/deprecated-functions.php
	modified:   zp-core/zp-extensions/exampleMacros.php
	modified:   zp-core/zp-extensions/hitcounter.php
	modified:   zp-core/zp-extensions/html_meta_tags.php
	modified:   zp-core/zp-extensions/security-logger.php
	modified:   zp-core/zp-extensions/tiny_mce.php
	modified:   zp-core/zp-extensions/trivialSpam.php
	modified:   zp-core/zp-extensions/uploader_http.php
	modified:   zp-core/zp-extensions/uploader_jQuery.php
	modified:   zp-core/zp-extensions/zenphotoDonate.php
	modified:   zp-core/zp-extensions/zenphoto_news.php
	modified:   zp-core/zp-extensions/zpCaptcha.php