WIP: Retina-icons and layout changes for people
Merge remote-tracking branch 'origin/master'