[Merge] lp:~phanimahesh/friends/friends into lp:friends

[J Phani Mahesh]

I'm not familiar with 'mock', which seems to be used for the unit tests. I've noticed that the tests fail, but was unable to identify what caused the failure. I'll give it a try once again.
Do you have any tips that might help in finding the cause of failure?

I've patched up my installation ( dog-fooding? :P) and it works great for me.
-- 
https://code.launchpad.net/~phanimahesh/friends/friends/+merge/166449
Your team Super Friends is subscribed to branch lp:friends.