Merge branch 'campaign_launch'

Conflicts:
	app/assets/stylesheets/users.css.scss
	app/views/devise/registrations/new.html.erb
	app/views/users/show.html.erb
	config/locales/pt-BR.yml
	db/migrate/20140812213540_add_username_to_users.rb