Created soleroids in seperate class
Merge branch 'team-devel' of https://github.com/VinnyOG/Aviance into team-devel