A Resolution Approving the City Manager's Report on City Employee Compensation Dated May 18, 2004; Adopting Amending General Administrative Provisions, Hours of Work and Other Terms and Conditions of Employment for Officers and Employees Not Represented by a Recognized Employee Organized, to be Effective June 26, 2004 and to Supersede Resolution No. 2003-446 on that Date;