Merge branch 'master' of https://github.com/hugdiniz/anuarioDjango

Merging files because unsync repository
adicionando método para recuperar a unidade a qual a sala pertence
Merge branch 'master' of https://github.com/hugdiniz/anuarioDjango