Changed database model but i'm not sure it works?
Made the database calls WAY faster and better
Merge branch 'ManyToMany'