Merge branch 'master' of git://github.com/catarse/catarse

Conflicts:
	.rvmrc
	Gemfile
	Gemfile.lock
	README.md
	app/controllers/adm/financials_controller.rb
	app/controllers/adm/projects_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/reports/backer_reports_for_project_owners_controller.rb
	app/controllers/reports/base_controller.rb
	app/decorators/project_decorator.rb
	app/models/unsubscribe.rb
	app/views/adm/projects/index.html.slim
	app/views/notifications_mailer/backer_project_successful.en.html.slim
	app/views/notifications_mailer/project_success.en.html.slim
	app/views/static/guidelines_backers.html.slim
	config/database.sample.yml
	config/environment.rb
	config/locales/adm.en.yml
	config/locales/adm.pt.yml
	db/migrate/20130213184141_change_permalink_to_not_null.rb
	spec/controllers/rewards_controller_spec.rb
	spec/controllers/unsubscribes_controller_spec.rb
	spec/decorators/project_decorator_spec.rb
	spec/lib/blog_spec.rb
	spec/models/unsubscribe_spec.rb
	spec/uploaders/logo_uploader_spec.rb