-                 			 $("#agregaAmigo")[0].reset();
+                 			 $("#agregaVisita")[0].reset();
-            	'imageUrl' => Yii::app()->baseUrl.'/images/like2.png',
+            	'imageUrl' => Yii::app()->baseUrl.'/images/like2.PNG	',
Merge branch 'master' of github.com:asabater/SocialCity

Conflicts:
	protected/views/ciudad/index.php
Merge branch 'master' of github.com:asabater/SocialCity
LAST