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

Capfile

README.md

Rakefile

app/controllers/albums_controller.rb

app/controllers/application_controller.rb

app/controllers/aspects_controller.rb

app/controllers/comments_controller.rb

app/controllers/dev_utilities_controller.rb

app/controllers/people_controller.rb

app/controllers/photos_controller.rb

app/controllers/publics_controller.rb

app/controllers/registrations_controller.rb

app/controllers/requests_controller.rb

app/controllers/services_controller.rb

app/controllers/sockets_controller.rb

app/controllers/status_messages_controller.rb

app/controllers/users_controller.rb

app/helpers/albums_helper.rb

app/helpers/application_helper.rb

app/helpers/aspects_helper.rb