(#131) Click handler, marker, and disappearing layer bugs fixed when switching to Map mode. Need to check what "this.mapAnimatorView.resetLayers()" is needed for though.
merges work done on ticket #131, may need further revision