New contract approved between City of San Diego and Police Officers Association