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

.gitignore

app/controllers/requests_controller.rb

app/controllers/users_controller.rb

app/models/request.rb

app/models/user.rb

app/views/albums/index.html.haml

app/views/aspects/_empty_messages.haml

app/views/aspects/index.html.haml

app/views/aspects/show.html.haml

app/views/invitations/_new.haml

app/views/js/_websocket_js.haml

app/views/layouts/application.html.haml

app/views/shared/_aspect_friends.haml

app/views/users/_account.haml

app/views/users/_profile.haml

config/locales/devise/devise.fr-informal.yml

config/locales/devise/devise.fr.yml

config/locales/devise/devise.tr.yml

config/locales/diaspora/en.yml

config/locales/diaspora/fr-informal.yml