removed unnesesary file watcher
Merge remote-tracking branch 'origin/master'