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

app/controllers/registrations_controller.rb

app/controllers/requests_controller.rb

app/models/person.rb

app/models/user.rb

config/locales/diaspora/en.yml

db/seeds/backer.rb

db/seeds/dev.rb

db/seeds/tom.rb

lib/diaspora/user/friending.rb

lib/diaspora/user/querying.rb

spec/controllers/registrations_controller_spec.rb

spec/controllers/requests_controller_spec.rb

spec/controllers/users_controller_spec.rb

spec/lib/diaspora_parser_spec.rb

spec/models/aspect_spec.rb

spec/models/person_spec.rb

spec/models/user/user_friending_spec.rb

spec/models/user/visible_posts_spec.rb

spec/models/user_spec.rb