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

Gemfile.lock

app/views/albums/show.html.haml

app/views/people/show.html.haml

app/views/photos/show.html.haml

app/views/shared/_aspect_friends.haml

app/views/status_messages/show.html.haml

config/locales/diaspora/en.yml

db/seeds/dev.rb

db/seeds/tom.rb

public/javascripts/stream.js

public/javascripts/view.js

public/stylesheets/sass/application.sass

spec/lib/diaspora_parser_spec.rb

spec/lib/web_hooks_spec.rb

spec/models/aspect_spec.rb

spec/models/comments_spec.rb

spec/models/user/receive_spec.rb

spec/models/user/visible_posts_spec.rb