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

.gitignore

Gemfile

Gemfile.lock

app/controllers/aspects_controller.rb

app/controllers/people_controller.rb

app/controllers/registrations_controller.rb

app/controllers/requests_controller.rb

app/controllers/users_controller.rb

app/models/person.rb

app/models/post.rb

app/models/profile.rb

app/models/user.rb

app/views/albums/_new_album.haml

app/views/aspects/_new_aspect.haml

app/views/devise/mailer/confirmation_instructions.html.haml

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

...views/devise/mailer/reset_password_instructions.html.haml

app/views/devise/mailer/unlock_instructions.html.haml

app/views/invitations/_new.haml

app/views/people/show.html.haml