Reward Box
Backers Review Adjustments
solved conflict
Merge branch 'master' into production
remove background linear to user can see the error on input
Merge branch 'master' into production
credits refactor, now we use only credits from user_totals view.
Merge branch 'master' of github.com:danielweinmann/catarse
fixed acceptance tests
confirm is protected
Merge branch 'production'
fix problems
fixed acceptance tests
removed confirmation from pending backers and Adm::Backers
fixing pending_backers_spec
removing some behaviours from the pending backers test that do not belong there
removed users table credits from Adm::UsersController
added sorting to adm::users
Implemented avatar upload for users

Local avatar is given preference over gravatar. Also fixed some typos in the Portuguese translation.
Some fixes to users avatars