Ajustes nos arquivos
Merge branch 'master' of https://github.com/holocronifrn/siade-server

Conflicts:
	.gitignore