Fixed crash
Merge branch 'Development' of github.com:ProjectStortSpel/Game into Development