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

Conflicts:
	php/class/Database.class.php
	templates/home.html

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