Adding support for the categorization of files (if the CategoriesP parameter is enabled for a package instance). Version is increased to 5.4.0d3 and folder, file and simple www/*-edit-2 files were removed and consolidated into www/*-edit.
merge changes on oacs-5-1 branch to head, changes between jcd-merge-20040420 and jcd-merge-5-1-20040517 were merged, head pre changes is jcd-merge-pre-20040517 and post is jcd-merge-post-20040517