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

[Kai Mast]

Okay I'll change the return to feed button. I really hope we can remove it at some point when this bug is fixed: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256424

The settings panel is a little overkill I understand, but I plan to add further settings (e.g. I would like to have switch to show the usernames instead of the display names). 


-- 
https://code.launchpad.net/~kai-mast/friends-app/images/+merge/204061
Your team Super Friends is subscribed to branch lp:friends-app.