nuevo
Merge branch 'master' of github.com:asabater/SocialCity
Cambios necesarios para que funcione
project
Merge branch 'master' of github.com:asabater/SocialCity

Conflicts:
	.project
	protected/controllers/ComentarioController.php
Comentario