fix config file template

Some things in the wrong place, some things that should not have been
there.
fix news and category links with trailing slashes

these trailing slashes should be allowed. The controller now removes
them if they are present.
release id bb6463d252
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/zenphoto_cfg.txt

	modified:   zp-core/functions-basic.php
	modified:   zp-core/functions-controller.php
	modified:   zp-core/githead