Added configuration of cities. The people page will group people by their city
Added links
Merge remote-tracking branch 'origin/master'