Merge remote branch 'upstream/master'

app/helpers/application_helper.rb

app/mailers/notifier.rb

app/models/person.rb

app/models/status_message.rb

app/models/user.rb

app/views/albums/_new_album.haml

app/views/albums/index.html.haml

app/views/albums/show.html.haml

app/views/aspects/index.html.haml

app/views/aspects/manage.html.haml

app/views/aspects/show.html.haml

app/views/notifier/new_request.html.haml

app/views/notifier/new_request.text.haml

app/views/notifier/request_accepted.html.haml

app/views/notifier/request_accepted.text.haml

app/views/photos/show.html.haml

app/views/publics/hcard.erb

app/views/shared/_author_info.html.haml

app/views/shared/_publisher.haml

app/views/shared/_sub_header.haml