City council approves two widely-opposed housing developments