fixed gamescreen
commiting to be able to merge, fixed conflicts
fixed conflicts in AndroidManifest.xml