added notification settings to users
allowing username update
send notification when rating and comment on stories
only authenticated users can update notification settings
Revert "corrigindo traducao"

This reverts commit 8f2fdee8037367d03706a6622c594c58cb2c908a.

Conflicts:
	config/locales/pt-BR.yml
Revert "adicionando descricao pro twitter"

This reverts commit e6bb875dde4d039d5763f7544150f15835c07063.

Conflicts:
	config/locales/pt-BR.yml
Merge pull request #43 from felipeik/email

Enviar emails de notificação quando alguém vota e comenta nos Bizus
Correção de bug ao consultar campo boolean passando parâmetro 1
subscribe email on mailchimp on user create
Adicionando página de perfil do usuário com os seus bizus
Ajustando o espaçamento entre a foto do perfil e as informações do usuário
Merge branch 'master' into lifenews

Conflicts:
	app/models/user.rb
	app/views/shared/_header.html.erb
	app/views/shared/_main_menu.html.erb
	config/environments/development.rb
	config/locales/pt-BR.yml
renamed Bizu / article
fixing profile page