t
Merge branch 'master' of https://github.com/diegopuglia/cdm
login con facebook
Merge branch 'master' of https://github.com/diegopuglia/cdm

Conflicts:
	frontend/application/controllers/CityController.php
	frontend/application/views/scripts/city/index.phtml