Merge branch 'master' of github.com:diaspora/diaspora into salmon

app/controllers/groups_controller.rb

app/controllers/users_controller.rb

app/views/albums/index.html.haml

app/views/albums/show.html.haml

app/views/devise/sessions/new.html.haml

app/views/groups/index.html.haml

app/views/groups/show.html.haml

app/views/layouts/application.html.haml

app/views/layouts/session_wall.html.haml

app/views/photos/show.html.haml

app/views/posts/_debug.haml

app/views/shared/_group_nav.haml

app/views/shared/_publisher.haml

app/views/users/new.html.haml

app/views/users/show.html.haml

public/javascripts/photos.js

public/javascripts/session_wall.js

public/javascripts/stream.js

public/stylesheets/application.css

public/stylesheets/sass/application.sass