Merge remote branch 'upstream/master'

app/controllers/users_controller.rb

app/helpers/application_helper.rb

app/models/user.rb

app/views/photos/show.html.haml

lib/diaspora/user/querying.rb

public/javascripts/view.js

public/stylesheets/sass/application.sass

spec/controllers/aspects_controller_spec.rb

spec/controllers/users_controller_spec.rb

spec/models/aspect_spec.rb

spec/models/user/visible_posts_spec.rb