Signed-off-by: lucas dos santos dias <lucas.sdias93@gmail.com>
Merge branch 'master' of github.com:lucasantosdias/sistema_alltime

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