Created efficient annotations, by changing the structure of them. Also did a lot of cleanup in GameMapController.
Merge remote-tracking branch 'origin'