Aperfeicoamento no layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	salao/app/controllers/clientes_controller.rb
	salao/app/controllers/realizas_controller.rb
	salao/app/views/clientes/servicos.html.erb
	salao/app/views/realizas/_form.html.erb
	salao/app/views/realizas/agenda_hoje.html.erb
	salao/app/views/realizas/index.html.erb
Aperfeicoamento no layout