Merge remote branch 'upstream/master'

app/views/layouts/application.html.haml

app/views/photos/_photo.haml

app/views/status_messages/show.html.haml

lib/diaspora/user/receiving.rb

public/stylesheets/sass/application.sass

spec/controllers/publics_controller_spec.rb

spec/lib/diaspora_parser_spec.rb

spec/models/photo_spec.rb

spec/models/user/attack_vectors_spec.rb