Cejam
Merge branch 'master' of https://github.com/leonardoruoso/Fila-Sistema-de-Atendimento

Conflicts:
	Fila-Administracao/lib/Fila/Administracao.pm
	Fila-Administracao/root/static/images/bg_cabecalho.jpg
	Fila-Painel/lib/Fila/Painel/Model/Output.pm
	Fila-Senha/lib/Fila/Senha.pm
	Fila-Senha/lib/Fila/Senha/Model/Emissor.pm
	Fila-Servico/lib/Fila/Servico.pm
	Fila-Servico/lib/Fila/Servico/Controller/WS/Gestao/Local.pm
	Fila-Servico/lib/Fila/Servico/Controller/WS/Gestao/Senha.pm
	Fila-Web/cgi-bin/nph-app.cgi
	Fila-Web/lib/Fila/WebApp/Controller/CB/Atendente.pm
	Fila-Web/lib/Fila/WebApp/Controller/CB/Gerente.pm
	Fila-Web/lib/Fila/WebApp/Controller/CB/Guiche.pm
	Fila-Web/lib/Fila/WebApp/Controller/Render.pm
	Fila-Web/root/static/images/bg_cabecalho.jpg
tz included.
x
no repeat passwords;
Merge branch 'master' of https://github.com/leonardoruoso/Fila-Sistema-de-Atendimento

Conflicts:
	Fila-Senha/lib/Fila/Senha.pm
	Fila-Servico/lib/Fila/Servico/Controller/WS/Gestao/Senha.pm
Merge branch 'master' of https://github.com/leonardoruoso/Fila-Sistema-de-Atendimento
Merge branch 'master' of https://github.com/leonardoruoso/Fila-Sistema-de-Atendimento