Merge branch 'development' into resourceManager
Changed PlayerShip to use ResourceManager.
Changed PauseScreenView to use ResourceManager.
Fixed tests.
Fixed merge conflicts.