Plan for trolley connecting San Diego to Tijuana moves forward