Set watches only when needed
Merge branch 'dirk_add_current_to_client' of github.com:nens/lizard-client into dirk_add_current_to_client