indicators working
fixed merged conflicts in gameactivity