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

Gemfile.lock

app/controllers/aspects_controller.rb

app/controllers/invitations_controller.rb

app/helpers/aspects_helper.rb

app/views/aspects/manage.html.haml

app/views/invitations/_new.haml

app/views/shared/_aspect_friends.haml

app/views/shared/_invitations.haml

app/views/shared/_public_explain.haml

app/views/shared/_publisher.haml

app/views/users/_services.haml

public/javascripts/view.js

public/stylesheets/sass/application.sass