Martinez moves forward on waterfront plan with hotels, amphitheater and ferry service