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

Gemfile

Gemfile.lock

app/controllers/invitations_controller.rb

app/controllers/users_controller.rb

app/models/person.rb

app/models/user.rb

app/views/aspects/manage.html.haml

app/views/invitations/_new.haml

app/views/invitations/edit.html.haml

app/views/invitations/new.html.haml

app/views/registrations/new.html.haml

app/views/shared/_aspect_friends.haml

app/views/users/_account.haml

app/views/users/_profile.haml

app/views/users/mailer/invitation.html.haml

config/initializers/devise.rb

config/locales/devise.en.yml

config/locales/diaspora/en.yml

config/routes.rb

public/javascripts/view.js