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

app/views/albums/_new_album.haml

app/views/aspects/_new_aspect.haml

app/views/invitations/_new.haml

app/views/requests/_new_request.haml

pkg/fedora/diaspora-setup

pkg/ubuntu/diaspora-setup

public/stylesheets/sass/application.sass

spec/models/user/attack_vectors_spec.rb