Manually merged branch Objects's GameScreen into 'develop'