[Merge] lp:~kai-mast/friends-app/images into lp:friends-app

[Robert Bruce Park]

Review: Needs Fixing

I don't think I care for the settings panel, frankly. A whole panel for one control? Can you just make it a toolbar button that toggles the image previews?
-- 
https://code.launchpad.net/~kai-mast/friends-app/images/+merge/204061
Your team Super Friends is subscribed to branch lp:friends-app.