redefine structure
minor changes
Merge branch 'master' of https://github.com/feups/Django-webapi