Watch marker location change is managed more correctly when it is in a cluster
Corrects error in evaluation of the watch when a layer change
Merge pull request #326 from JaumeFigueras/master

Solves issue #320