Merge remote-tracking branch 'atlatszo_github/rails-3-develop' into rails-3-develop
Make custom error messages translated.
Merge branch 'feature/fix-profile-photo-errors' into rails-3-develop