updated build watch task
Merge branch 'origin/master'