bootstrap_carousel(): rename author into city
Merge branch 'master' of github.com:ConnectedSets/ConnectedSets