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

.gitignore

Gemfile

app/controllers/registrations_controller.rb

app/controllers/users_controller.rb

app/models/post.rb

app/models/profile.rb

app/models/user.rb

app/views/albums/_new_album.haml

app/views/aspects/_new_aspect.haml

app/views/invitations/_new.haml

app/views/layouts/application.html.haml

app/views/photos/_photo.haml

app/views/registrations/new.html.haml

app/views/requests/_new_request.haml

app/views/shared/_public_explain.haml

app/views/shared/_reshare.haml

app/views/status_messages/show.html.haml

config/app_config.yml.example

config/routes.rb

lib/diaspora/exporter.rb