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

[Robert Bruce Park]

One thing to watch out for is that you have a ton of trailing whitespace all over. I don't like to see that in my code ;-)

Don't worry, I'm cleaning it up for this merge, but if you could start stripping trailing whitespace before committing I'd appreciate it.
-- 
https://code.launchpad.net/~kai-mast/friends/links/+merge/202954
Your team Super Friends is subscribed to branch lp:friends.