Mudancas no Layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	salao/app/models/cliente.rb