Merge branch 'master' of github.com:diaspora/diaspora

app/views/layouts/application.html.haml

app/views/photos/_photo.haml

app/views/shared/_aspect_friends.haml

app/views/shared/_aspect_nav.haml

public/images/tipsy.gif

public/javascripts/jquery.tipsy.js

public/javascripts/view.js

public/stylesheets/sass/application.sass

public/stylesheets/tipsy.css