Merge remote branch 'upstream/master'

app/controllers/aspects_controller.rb

app/helpers/application_helper.rb

app/helpers/aspects_helper.rb

app/models/aspect.rb

app/models/person.rb

app/models/user.rb

app/views/albums/index.html.haml

app/views/albums/show.html.haml

app/views/aspects/_no_friends_message.haml

app/views/aspects/_no_posts_message.haml

app/views/aspects/index.html.haml

app/views/aspects/manage.html.haml

app/views/aspects/show.html.haml

app/views/js/_websocket_js.haml

app/views/layouts/application.html.haml

app/views/people/_person.html.haml

app/views/people/index.html.haml

app/views/people/show.html.haml

app/views/photos/_photo.haml

app/views/photos/show.html.haml