[Merge] lp:~ken-vandine/friends-app/phablet_friendly into lp:friends-app

[PS Jenkins bot]

Review: Approve continuous-integration

PASSED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/friends-app-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-saucy-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-app-ci/6/rebuild

-- 
https://code.launchpad.net/~ken-vandine/friends-app/phablet_friendly/+merge/169933
Your team Super Friends is subscribed to branch lp:friends-app.