- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s

Users controller small fix; removed the to_activity method and the corresponding tests for status_message model

This reverts commit 64081059.

Conflicts:

	db/schema.rb

This reverts commit 226554be.

Conflicts:

	config/locales/diaspora/en.yml

DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams

show actual screenshots of diaspora mobile on logout; supress log out flash message; bootstrap on logged out page (can we get d* shots in wp7 and android emulators?)

Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>

Limit posts in the RSS feed, wecan come back to this and not limit it, and instead cache the static feed, when we have a little more time.