Merge commit '740b26669d7c815c23faadc9560ad94e35ecabe8'

Conflicts:
	app/views/clientes/_show.html.erb
Merge branch 'master' of https://github.com/proizprojetos/Proiz_admin

Conflicts:
	app/views/clientes/_show.html.erb