Fixed conflict in merge #3877d7864c

There seemed to be more conflicts with merging my commit and @zento's commit (2beda0c786). I believe it is fixed. Please review new code. I placed the settings and assetManager into the settings and Game objects, respectively.