Merge pull request #44 from blessedguy/master

fixes infufg/sade#18
Atualiza .gitignore

Templates adicionados ao gitignore: OS X, Windows, JetBrains, NetBeans, Eclipse
Alterado os arquivos das classes de entidades conforme alteração no modelo
Alterado os arquivos das entidades conforme alteração no modelo
Merge pull request #52 from blessedguy/master

fixes infufg/sade#47
fixes infufg/SADE#49
resolve conflito
Merge pull request #53 from luizhenriquees/master

fixes infufg/SADE#49
fixes infufg/sade#46
fixes infufg/sade#46
Merge pull request #54 from jullianonascimento/master

fixes infufg/SADE#46
fixes infufg/sade#50
Merge pull request #55 from kuninory/master

fixes infufg/sade#50
fixes infufg/sade#50
Merge pull request #56 from kuninory/master

fixes infufg/sade#50
Corrigido os moderos ER
Merge pull request #57 from kuninory/master

Corrigido os modelos ER
fixes infufg/SADE#19
Merge branch 'master' of https://github.com/infufg/SADE
Merge pull request #58 from luizhenriquees/master

fixes infufg/SADE#19