Proposal for 1,200 homes, 100-villa resort in south La Quinta approved by city council