Subida de seguidad :)
Merge branch 'master' of github.com:asabater/SocialCity

Conflicts:
	protected/views/ciudad/index.php
Merge branch 'master' of github.com:asabater/SocialCity
'actions'=>array('index','view', 'autocompletaCiudades'),
Merge branch 'master' of github.com:asabater/SocialCity

Conflicts:
	protected/controllers/VisitaController.php