Json de kamikazes
Merge branch 'master' of https://github.com/julioguevara/FoursquareSantaFe
Merge branch 'master' of https://github.com/julioguevara/FoursquareSantaFe
Conexión de trendings e iconos
Merge branch 'master' of https://github.com/julioguevara/FoursquareSantaFe
Merge branch 'master' of https://github.com/julioguevara/FoursquareSantaFe

Conflicts:
	app/views/index.html
add(route): hashtag
add(controller): hashtags
add(model): hashtag
Merge branch 'master' of github.com:julioguevara/FoursquareSantaFe
colores de lugares
Merge branch 'master' of https://github.com/julioguevara/FoursquareSantaFe
iconos de interes
Merge branch 'master' of https://github.com/julioguevara/FoursquareSantaFe
front y estilos de pop up
animacion