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

Gemfile.lock

app/controllers/application_controller.rb

app/controllers/aspects_controller.rb

app/controllers/invitations_controller.rb

app/views/invitations/_new.haml

lib/diaspora/user/friending.rb

spec/models/request_spec.rb

spec/models/user/invite_spec.rb

spec/spec_helper.rb