Reworked models and realtions
Merge branch 'master' of https://github.com/Brobin/Blastoff