Signed-off-by: Everaldo <everaldo@agenciamanga.com.br>
Merge branch 'master' of github.com:lucasantosdias/sistema_alltime

Conflicts:
	php/temp/solicitacao_impressa_26-06-2014.pdf