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

app/controllers/registrations_controller.rb

app/controllers/status_messages_controller.rb

app/helpers/aspects_helper.rb

app/helpers/status_messages_helper.rb

app/models/person.rb

app/models/user.rb

app/views/albums/edit.html.haml

app/views/albums/index.html.haml

app/views/aspects/_new_aspect.haml

app/views/aspects/manage.html.haml

app/views/aspects/public.html.haml

app/views/comments/_new_comment.html.haml

app/views/invitations/_new.haml

app/views/people/new.html.haml

app/views/people/show.html.haml

app/views/photos/edit.html.haml

app/views/photos/show.html.haml

app/views/requests/_new_request.haml

app/views/shared/_aspect_friends.haml

app/views/shared/_publisher.haml