add field for entry
update AddToWatchList and StopWatching API
Merge branch 'master' into novice-tutorials