Merge branch 'profiles' of github.com:diaspora/diaspora into profiles

app/controllers/people_controller.rb

app/helpers/layout_helper.rb

app/models/post.rb

app/presenters/post_presenter.rb

app/views/layouts/application.html.haml

app/views/layouts/post.html.haml

app/views/people/_sub_header.html.haml

config/application.rb

config/locales/diaspora/en.yml

config/routes.rb

features/logged_out_browsing.feature

public/javascripts/app/app.js

public/javascripts/app/models/user.js

public/javascripts/app/pages/post-viewer.js

public/javascripts/app/router.js

public/javascripts/app/views.js

public/javascripts/app/views/comment_view.js

public/javascripts/app/views/feedback_view.js

public/javascripts/app/views/post-viewer/interactions.js

public/javascripts/app/views/post_view.js