Display name and location on details page
Merge branch 'master' of github.com:inez/stuff