dependencies
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
listado de lugares en sidebar
Merge pull request #56 from alcance/master

listado de lugares en sidebar
passport
conflictos feos