string concatenation with translations is bad, especially if you leave on part of it untranslated :P

This reverts commit 3af5e24a.

Conflicts:

	app/controllers/aspects_controller.rb

Refactor saved state cucumber feature to be more consistent. (It was occasionally failing locally due to a timing issue.)

This reverts commit eddd8d96.

use explicit check in User#disconnect_everyone, the previous check failed in rarly weired situations, I can't tell why

let the user upload an image without touching the textarea, improved check in Photo#process to not yield no method on nil error in some cases

actually it was the other way around, we have to tell ruby that it's utf8, though now the build fails because (first guess) \w probably doesn't include utf8 chars in 1.9

This reverts commit c84f7671.