Merging loadoutScreen into development
Fixed tests.
Merge branch 'development' of https://github.com/Jokab/Bullet-Inferno into development