Update menu_tab.php

typo
Update admin-categories.php

typo
Update admin-users.php

typo
Merge pull request #547 from sphoto/patch-13

Update menu_tab.php
Merge pull request #548 from sphoto/patch-14

Update admin-categories.php
Merge pull request #550 from sphoto/patch-16

Update admin-users.php
Update admin-options.php

typo
Update admin-options.php

another typo, the last one for today :-)
Merge pull request #551 from sphoto/patch-17

Update admin-options.php
Merge pull request #552 from sphoto/patch-18

Update admin-options.php
detect need to cache images during 404 handling
Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/Zenphoto.package

	modified:   zp-core/404.php
	modified:   zp-core/Zenphoto.package
	modified:   zp-core/admin-options.php
	modified:   zp-core/admin-users.php
	modified:   zp-core/functions-basic.php
	modified:   zp-core/index.php
	modified:   zp-core/zp-extensions/cacheManager/cacheDBImages.php
	new file:   zp-core/zp-extensions/cacheManager/functions.php
	modified:   zp-core/zp-extensions/menu_manager/menu_tab.php
	modified:   zp-core/zp-extensions/zenpage/admin-categories.php