more changes
Merge branch 'master' of github.com:dafonso/PSI-PL001

Conflicts:
	admin/relatorios.php