atualizando e-mail
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/img/photos/icon/site/barrinha.jpg
aa