Render icon images for locations.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #20 from oliverds/master

Icons for categories #825