Merge
Merging
Add new constructor for Airport that doesn't load image for testing purposes (fixes failing tests due to no OpenGL context)
Remove unused imports, access static variables correctly